From c52e97a1d827777780a35c7af55d8c371174c79c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 1 Apr 2018 10:01:24 -0700 Subject: [PATCH] tests: Fix sed usage in pmd test. SUSv7 2016 Edition says: [2addr] {editing command editing command ... } Execute a list of sed editing commands only when the pattern space is selected. The list of sed editing commands shall be surrounded by braces. The braces can be preceded or followed by characters. The shall be preceded by a or (before any optional characters preceding the ). This usage in pmd.at omitted the semicolon before the right brace. This commit fixes the problem, which was rejected by the sed utility on Alpine Linux (which presumably comes from some version of busybox, but BusyBox v1.22.1 (Debian 1:1.22.0-9+b1) on my system accepts the form without semicolon). Reported-by: Stuart Cardall Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-March/046460.html Signed-off-by: Ben Pfaff Tested-by: Stuart Cardall --- tests/pmd.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pmd.at b/tests/pmd.at index 1568ab991..532a182ba 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -149,7 +149,7 @@ TMP=$(cat ovs-vswitchd.log | wc -l | tr -d [[:blank:]]) AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-cpu-mask=0x3]) CHECK_PMD_THREADS_CREATED([2], [], [+$TMP]) -AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed ':a;/AVAIL$/{N;s/\n//;ba}' | parse_pmd_rxq_show_group | sed SED_NUMA_CORE_QUEUE_PATTERN], [0], [dnl +AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed ':a;/AVAIL$/{N;s/\n//;ba;}' | parse_pmd_rxq_show_group | sed SED_NUMA_CORE_QUEUE_PATTERN], [0], [dnl port: p0 queue-id: port: p0 queue-id: ])