Commit 9afe2322 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'unbreak-basic-and-bpf-tdc-testcases' 



Davide Caratti says:

====================
unbreak 'basic' and 'bpf' tdc testcases

- patch 1/2 fixes tdc failures with 'bpf' action on fresch clones of the
  kernel tree
- patch 2/2 allow running tdc for the 'basic' classifier without tweaking
  tdc_config.py
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2b5b8251 e9ed4fa7

tools/testing/selftests/tc-testing/plugin-lib/buildebpfPlugin.py

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class SubPlugin(TdcPlugin): 
            shell=True,

            stdout=subprocess.PIPE,

            stderr=subprocess.PIPE,

            env=ENVIR)

            env=os.environ.copy())

        (rawout, serr) = proc.communicate()



        if proc.returncode != 0 and len(serr) > 0:

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

+51 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -25,6 +28,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -44,6 +50,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -63,6 +72,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -82,6 +94,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -101,6 +116,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -120,6 +138,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -139,6 +160,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -158,6 +182,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -177,6 +204,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -196,6 +226,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -215,6 +248,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -234,6 +270,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -253,6 +292,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -272,6 +314,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -291,6 +336,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],
@@ -310,6 +358,9 @@ 
            "filter",

            "basic"

        ],

        "plugins": {

            "requires": "nsPlugin"

        },

        "setup": [

            "$TC qdisc add dev $DEV1 ingress"

        ],

CRA Git | Maintained and supported by SUSTech CRA and CCSE