Skip to content

Commit 196640a

Browse files
committed
Merge branch 'ns-plugin-fixes'
Vlad Buslov says: ==================== Fix problems with using ns plugin Recent changes to plugin architecture broke some of the tests when running tdc without specifying a test group. Fix tests incompatible with ns plugin and modify tests to not reuse interface name of ns veth interface for dummy interface. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 6636fb3 + 14b54ac commit 196640a

File tree

6 files changed

+295
-294
lines changed

6 files changed

+295
-294
lines changed

tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"$TC qdisc add dev $DEV2 ingress",
1313
"./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 add"
1414
],
15-
"cmdUnderTest": "find $BATCH_DIR/add* -print | xargs -n 1 -P 10 $TC -b",
15+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/add* -print | xargs -n 1 -P 10 $TC -b\"",
1616
"expExitCode": "0",
1717
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
1818
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -37,7 +37,7 @@
3737
"$TC -b $BATCH_DIR/add_0",
3838
"./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 del"
3939
],
40-
"cmdUnderTest": "find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -b",
40+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -b\"",
4141
"expExitCode": "0",
4242
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
4343
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -62,7 +62,7 @@
6262
"$TC -b $BATCH_DIR/add_0",
6363
"./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 replace"
6464
],
65-
"cmdUnderTest": "find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b",
65+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",
6666
"expExitCode": "0",
6767
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
6868
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -87,7 +87,7 @@
8787
"$TC -b $BATCH_DIR/add_0",
8888
"./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 replace"
8989
],
90-
"cmdUnderTest": "find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b",
90+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",
9191
"expExitCode": "0",
9292
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
9393
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -112,7 +112,7 @@
112112
"$TC -b $BATCH_DIR/add_0",
113113
"./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 del"
114114
],
115-
"cmdUnderTest": "find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -f -b",
115+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -f -b\"",
116116
"expExitCode": "123",
117117
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
118118
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -134,11 +134,11 @@
134134
"/bin/mkdir $BATCH_DIR",
135135
"$TC qdisc add dev $DEV2 ingress",
136136
"./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 5 add",
137-
"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b",
137+
"bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",
138138
"./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 add",
139139
"./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
140140
],
141-
"cmdUnderTest": "find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b",
141+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",
142142
"expExitCode": "0",
143143
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
144144
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -160,11 +160,11 @@
160160
"/bin/mkdir $BATCH_DIR",
161161
"$TC qdisc add dev $DEV2 ingress",
162162
"./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 10 add",
163-
"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b",
163+
"bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",
164164
"./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 replace",
165165
"./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"
166166
],
167-
"cmdUnderTest": "find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b",
167+
"cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",
168168
"expExitCode": "0",
169169
"verifyCmd": "$TC -s filter show dev $DEV2 ingress",
170170
"matchPattern": "filter protocol ip pref 1 flower chain 0 handle",

0 commit comments

Comments
 (0)