diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-04-17 21:33:53 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-04-17 21:33:53 +0000 |
| commit | da10d8b28d753a3f70d83ef74b809a853d2f18ac (patch) | |
| tree | 501be22564f034fdc0fb2a8e30b767fe59e66e36 | |
| parent | 8c76d7a3c1938d58770eabfbd2a2443baf3346e6 (diff) | |
| parent | 9e32703e8315575416fa5cc469ba6f3ed70710e4 (diff) | |
| download | kernel_tests-platform-tools-30.0.0.tar.gz kernel_tests-platform-tools-30.0.0.tar.bz2 kernel_tests-platform-tools-30.0.0.zip | |
Snap for 6405781 from 9e32703e8315575416fa5cc469ba6f3ed70710e4 to sdk-releaseplatform-tools-30.0.0
Change-Id: I5b96ef1fa3588cbf471a3c4ba9afa3f162ef456a
| -rw-r--r-- | net/test/Android.bp | 2 | ||||
| -rwxr-xr-x | net/test/multinetwork_test.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/test/Android.bp b/net/test/Android.bp index 080d27d8..0d6312db 100644 --- a/net/test/Android.bp +++ b/net/test/Android.bp @@ -26,6 +26,6 @@ python_test { name: "vts_kernel_net_tests", main: "all_tests.py", defaults: ["kernel_net_tests_defaults",], - test_suites: ["vts-core",], + test_suites: ["vts",], auto_gen_config: false, } diff --git a/net/test/multinetwork_test.py b/net/test/multinetwork_test.py index dc440b3d..a0b464ac 100755 --- a/net/test/multinetwork_test.py +++ b/net/test/multinetwork_test.py @@ -890,7 +890,7 @@ class RATest(multinetwork_base.MultiNetworkBaseTest): def MakePref64Option(self, prefix, lifetime): prefix = inet_pton(AF_INET6, prefix)[:12] - lft_plc = (lifetime << 3) | 0 # 96-bit prefix length + lft_plc = (lifetime & 0xfff8) | 0 # 96-bit prefix length return self.Pref64Option((self.ND_OPT_PREF64, 2, lft_plc, prefix)) @unittest.skipUnless(net_test.LINUX_VERSION >= (4, 9, 0), "not backported") |