ovs-ofctl: Factor code out of read_flows_from_switch().

[openvswitch] / tests / ofproto-macros.at

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 3656ecf26b9b6e90c4c2c39f83492a323f5c794a..b0c4fa048c05caa8c3c8a415d32555f34a201a2b 100644 (file)
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -10,6 +10,8 @@ s/ cookie=0x0,//
 s/ table=0,//
 s/ n_packets=0,//
 s/ n_bytes=0,//
+s/ idle_age=[0-9]*,//
+s/ hard_age=[0-9]*,//
 '
 }]
 m4_divert_pop([PREPARE_TESTS])
@@ -27,9 +29,9 @@ m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m'])
 # output (e.g. because it includes "create" commands) then 'vsctl-output'
 # specifies the expected output after filtering through uuidfilt.pl.
 m4_define([OVS_VSWITCHD_START],
-  [OVS_RUNDIR=$PWD; export OVS_RUNDIR
-   OVS_LOGDIR=$PWD; export OVS_LOGDIR
-   OVS_SYSCONFDIR=$PWD; export OVS_SYSCONFDIR
+  [OVS_RUNDIR=`pwd`; export OVS_RUNDIR
+   OVS_LOGDIR=`pwd`; export OVS_LOGDIR
+   OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
    trap 'kill `cat ovsdb-server.pid ovs-vswitchd.pid`' 0
 
    dnl Create database.