NAK: [ACT][PATCH] Revert "UBUNTU SAUCE: ubuntu_kernel_selftests: disable network l2tp test"

Tim Gardner tim.gardner at canonical.com
Fri Mar 19 17:48:38 UTC 2021


Between the LP bug state being marked as Invalid, and this being a 
revert, I can't really tell what you want here. How about fixing the bug 
state and resubmitting ?

rtg

On 3/16/21 10:21 PM, Po-Hsu Lin wrote:
> BugLink: https://bugs.launchpad.net/bugs/1880631
> 
> This test was blacklisted in bug 1854968 due to it's breaking 5.4
> s390x. With the fix 27d53323664c54 ("l2tp: remove skb_dst_set() from
> l2tp_xmit_skb()") landed in our kernels (except F-OEM-5.6, see bug
> 1919277) I think we can put this back now.
> 
> This reverts commit 05d7eebf32c6872ebce6c9e5275b1ff9d91ecd16.
> 
> Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
> ---
>   ubuntu_kernel_selftests/ubuntu_kernel_selftests.py | 10 ----------
>   1 file changed, 10 deletions(-)
> 
> diff --git a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> index a1e1422f..b7bcff74 100644
> --- a/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> +++ b/ubuntu_kernel_selftests/ubuntu_kernel_selftests.py
> @@ -140,16 +140,6 @@ class ubuntu_kernel_selftests(test.test):
>                   cmd = 'sed -i "s/ rtcpie//" ' + fn
>                   utils.system(cmd)
>   
> -            #
> -            # this test breaks 5.0+ (and maybe earlier), disable it for now
> -            # 5/12/2019, LP#1854968
> -            #
> -            print("Disabling l2tp.sh")
> -            fn = 'linux/tools/testing/selftests/net/l2tp.sh'
> -            if os.path.exists(fn):
> -                cmd = 'chmod -x ' + fn
> -                utils.system(cmd)
> -
>               #
>               # update fix CPU hotplug test, new and old versions
>               #
> 

-- 
-----------
Tim Gardner
Canonical, Inc



More information about the kernel-team mailing list