summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add the same mark with policy in SaInfo API am: 5dbde7434bandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releasePierre Lee2019-07-291-9/+19
|\ | | | | | | | | | | am: fc4ca0f83c Change-Id: Ia0338dec19a288ff53db50a5b6ad72db9a24c277
| * Add the same mark with policy in SaInfo APIPierre Lee2019-07-291-9/+19
|/| | | | | | | | | | | am: 5dbde7434b Change-Id: I8314627b40edb2c854fa9a6667ad5397cbd65d6c
| * Add the same mark with policy in SaInfo APIPierre Lee2019-07-261-9/+19
|/ | | | | | | | | | | | Due to mtk design of ipsec monitor, kernel will create a new SA when running the testUpdateActiveSaMarks case, so there are two SAs, but the expected number of SAs is one. We need to avoid creating the extra SA. Bug: 137509253 Change-Id: I0ebc7e737e09cdad321efd7363ce689baa3df03b Test: run vts -m VtsKernelNetTest -t VtsKernelNetTest#testKernelNetworking Merged-In: Ic5a82ac9f8531b75e61ce9188aa35ef9a0ca0619
* Fix tcp_repair_test that use mapped addressesandroid10-devmarkchien2019-05-081-2/+3
| | | | | | | | | | | | | | | There is different between bionic (on-device tests) and glibc (VM tests) around interpreting IPv4-mapped addresses. Bionic don't convert mapped addresses into IPv4 addresses. Bug: 130199266 Test: run_net_test.sh tcp_repair_test.py Test: m kernel_net_tests && adb push && adb shell /data/nativetest64/kernel_net_tests/kernel_net_tests Change-Id: I4705464a97c6daec36c69ce72cde58a8bc705929 Merged-In: I2b4c9f111f19dab4cfe29ce16ca130cdff2fba91 (cherry picked from commit f4599d1a1231dfaafe71ece2d7533fb8d8d5d21b)
* Refactor parameterization logic in net tests am: f1a12c8650Benedict Wong2019-04-110-0/+0
|\ | | | | | | | | | | am: d9968a1e8b Change-Id: I9c0a50fe755ad8572577aa153e938efc699faeb6
| * Refactor parameterization logic in net testsBenedict Wong2019-04-113-76/+173
| |\ | | | | | | | | | | | | | | | am: f1a12c8650 Change-Id: I10de9552507519386bd8f3097e83ec3db0b5d4b9
| | * Refactor parameterization logic in net testsBenedict Wong2019-03-263-76/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change refactors the logic to create parameterized tests in the kernel unit tests. Logic for name generation is left to classes, while common code for test injection is moved to the utility class Bug: 66467511 Test: Ran net tests Change-Id: I7eba57c616145246637beefac3aca16f9e2e899e (cherry picked from commit ad7a31a77695b60bdcd223df568a2b921acc41b0)
* | | Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | am: 17f8bde848 Change-Id: Ic73d4307cf00db8cd8498d26b72f4063acb7548d
| * \ \ Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur2019-03-297-11/+192
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Change-Id: I4fc3c95c5a0061f171b3c7f972b5c44ffb8cbe19 BUG: 129345239
* | \ \ \ Add tests for tcp connection repair am: a3196de82e am: 0192118a65markchien2019-04-013-1/+342
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | am: c4ff7b8187 Change-Id: I9540aebb1a8d549348f3f8d32235086217a637f0
| * | | | Add tests for tcp connection repair am: a3196de82emarkchien2019-04-013-1/+342
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0192118a65 Change-Id: I5581677a5dae87aaa39aff21f5081e984bde02cb
| | * \ \ \ Add tests for tcp connection repairmarkchien2019-04-013-1/+342
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a3196de82e Change-Id: Ic21c28d28c01684f73de8c10df82e6a7d29082bf
| | | * | | | Add tests for tcp connection repairandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5markchien2019-04-013-1/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add tests to ensure tcp connection works correctly in repair mode. Bug: 114151147 Bug: 129463499 Test: run_net_test.sh tcp_repair_test.py Change-Id: I91df2e4156002ea62073d7543071c02f11a1de60
* | | | | | | net-test: allow bpf on 32-bit userspace with 64-bit kernel am: fab9a47146 ↵Maciej enczykowski2019-03-241-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0508643812 am: ba594a073f Change-Id: I2972f08b042ae8d2e768a47a208d3f7a6208eb7f
| * | | | | | net-test: allow bpf on 32-bit userspace with 64-bit kernel am: fab9a47146Maciej enczykowski2019-03-241-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0508643812 Change-Id: I117cbb02e30bdb00a68d88e10ac4511dfc5e9d6e
| | * | | | | net-test: allow bpf on 32-bit userspace with 64-bit kernelMaciej enczykowski2019-03-241-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fab9a47146 Change-Id: Id8b330449f6499dc79274ca1a8b3dddf364820bf
| | | * | | | net-test: allow bpf on 32-bit userspace with 64-bit kernelMaciej Żenczykowski2019-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves: Running /host/all_tests.py Traceback (most recent call last): File "/host/all_tests.py", line 51, in <module> import_module(name) File "/usr/lib/python2.7/importlib/__init__.py", line 37, in import_module __import__(name) File "/host/bpf_test.py", line 26, in <module> from bpf import * # pylint: disable=wildcard-import File "/host/bpf.py", line 41, in <module> }[os.uname()[4] + "-" + platform.architecture()[0]] KeyError: 'x86_64-32bit' Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I64f246a4fd34c8a84e9c349957060d7d1be18175
* | | | | | | net-test: rootfs/net_test.sh - minor stylistic fixes am: 789dcf76b6 am: ↵Maciej enczykowski2019-03-241-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3037c36ff8 am: 9dc5d59b92 Change-Id: Id68aafabd39d54ab319af992b726a716f4a9b8d6
| * | | | | | net-test: rootfs/net_test.sh - minor stylistic fixes am: 789dcf76b6Maciej enczykowski2019-03-241-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3037c36ff8 Change-Id: I69ce12ac7bd9f3f4200049129f0c2d54f393ec5d
| | * | | | | net-test: rootfs/net_test.sh - minor stylistic fixesMaciej enczykowski2019-03-241-3/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 789dcf76b6 Change-Id: I914180168703df919411ba30c86e694de57afa2b
| | | * | | | net-test: rootfs/net_test.sh - minor stylistic fixesMaciej Żenczykowski2019-03-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google shell style guide: https://google.github.io/styleguide/shell.xml says to always use "${x}" instead of $x, and in general to double quote everything (fixes issues with whitespace in variable expansions). Similarly [[ is bash builtin, unlike [ or test. Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I507ceb630e7dd7347783e499826dcce2c2c50ee5
* | | | | | | net-test: require rootfs/net_test.sh to be error free am: 2afd2efd83 am: ↵Maciej enczykowski2019-03-241-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 495e005433 am: f2a7312d73 Change-Id: Ib43da666376f2bc701b646ffd4e0b16bd7da5186
| * | | | | | net-test: require rootfs/net_test.sh to be error free am: 2afd2efd83Maciej enczykowski2019-03-241-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 495e005433 Change-Id: Ibb3ad419ba37a36e342988a6ba75638f3a1eb455
| | * | | | | net-test: require rootfs/net_test.sh to be error freeMaciej enczykowski2019-03-241-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2afd2efd83 Change-Id: I90e836262d3486be580b9241e2b4c0b2aa5d34aa
| | | * | | | net-test: require rootfs/net_test.sh to be error freeMaciej Żenczykowski2019-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for: /sbin/net_test.sh: line 33: ./net_test.sh: No such file or directory not resulting in a test error (android common 3.18/4.4 on stretch rootfs) Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ib6c9698e98cec39eadcb371b5241241541e276d9
* | | | | | | net_test: introduce build_all_rootfs.sh am: de51b09901 am: 9d0f5a9c55Maciej enczykowski2019-03-241-0/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ede9fe3221 Change-Id: Ib28a03017157b18877bafce6373e065c77596c12
| * | | | | | net_test: introduce build_all_rootfs.sh am: de51b09901Maciej enczykowski2019-03-241-0/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9d0f5a9c55 Change-Id: I5aa450930cfb356d020029b57f3afeb50c6a33d5
| | * | | | | net_test: introduce build_all_rootfs.shMaciej enczykowski2019-03-241-0/+30
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: de51b09901 Change-Id: I274460e9ce71e3d7be0257b124bad6790a1c114e
| | | * | | | net_test: introduce build_all_rootfs.shMaciej Żenczykowski2019-03-221-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I64cf43e0522515a915d8e6b95fc73e50518683a4
* | | | | | | net-test: build_rootfs.sh support for i386 & armhf am: 03aa0a663f am: 14b7fb1d05Maciej enczykowski2019-03-241-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2e804885d5 Change-Id: I9d34f2f22b674f450737800f6a330eefa12b54af
| * | | | | | net-test: build_rootfs.sh support for i386 & armhf am: 03aa0a663fMaciej enczykowski2019-03-241-6/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 14b7fb1d05 Change-Id: Ie7b2e5707d27349dcb10cf515daffcd0d7adfbde
| | * | | | | net-test: build_rootfs.sh support for i386 & armhfMaciej enczykowski2019-03-241-6/+10
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 03aa0a663f Change-Id: Idd14c693f8febc52eddd2d4b8801d66fca95df80
| | | * | | | net-test: build_rootfs.sh support for i386 & armhfMaciej Żenczykowski2019-03-221-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I63b719e252dde32be3996a6c9747d116650c6b7e
* | | | | | | net-test: build_rootfs.sh - fix post debian wheezy move to archive am: ↵Maciej enczykowski2019-03-241-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc960f3d0f am: b5779ea931 am: b58db794d5 Change-Id: I7b25303d4b50163d827c828ea6965d7279bb3d4f
| * | | | | | net-test: build_rootfs.sh - fix post debian wheezy move to archive am: ↵Maciej enczykowski2019-03-241-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc960f3d0f am: b5779ea931 Change-Id: I2e81562befe707ddad1afc5f9477c9f2958eec61
| | * | | | | net-test: build_rootfs.sh - fix post debian wheezy move to archiveMaciej enczykowski2019-03-241-1/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bc960f3d0f Change-Id: I3452175f875cdc6e92e348633b8b9c3216f31bd7
| | | * | | | net-test: build_rootfs.sh - fix post debian wheezy move to archiveMaciej Żenczykowski2019-03-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I8ebb926ab6ce8f09baeec65861a23c8c4a59acff
* | | | | | | net-test: add a test for a kernel panic triggered by a bad backport am: ↵Maciej enczykowski2019-03-223-0/+137
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccad07c91f am: dce2437344 am: d4038d5017 Change-Id: I52a85a239e71fd69391c6faeb899def8db6b0340
| * | | | | | net-test: add a test for a kernel panic triggered by a bad backport am: ↵Maciej enczykowski2019-03-223-0/+137
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ccad07c91f am: dce2437344 Change-Id: I1a3c0d7b12ce41ecde7d7a2e10ffb78f60bbb4e1
| | * | | | | net-test: add a test for a kernel panic triggered by a bad backportMaciej enczykowski2019-03-223-0/+137
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ccad07c91f Change-Id: I95378d29a718d542f1510f3db94c1cf605522c53
| | | * | | | net-test: add a test for a kernel panic triggered by a bad backportMaciej Żenczykowski2019-03-223-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested via: ARCH=um SUBARCH=x86_64 WERROR=0 /aosp-tests/net/test/run_net_test.sh --builder all_tests.py Bug: 117102691 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I694e361bc478cdb53da19b7669e3aa2a42793cd9
* | | | | | | net-test: build_rootfs - add base debian os to default image name am: ↵Maciej enczykowski2019-03-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b384ccf3d am: 0e80d0648c am: e6b2ce28f8 Change-Id: I5bc74acf471631dcd64c5cdd0d31f08627551780
| * | | | | | net-test: build_rootfs - add base debian os to default image name am: 1b384ccf3dMaciej enczykowski2019-03-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0e80d0648c Change-Id: Ie2ee9b23d86be317f6696b42de4ea0dba091e4a0
| | * | | | | net-test: build_rootfs - add base debian os to default image nameMaciej enczykowski2019-03-211-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1b384ccf3d Change-Id: Icc92b0e2703edddf8a57db5652568bb0a543f01f
| | | * | | | net-test: build_rootfs - add base debian os to default image nameMaciej Żenczykowski2019-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I5a748479cb48e7bef33717d82e79348be97e5cd2
* | | | | | | net-test: build_rootfs - fix -n being ignored am: e9e18054c2 am: 0ee596ee82Maciej enczykowski2019-03-211-1/+3
|\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | am: 1ffe120dd3 Change-Id: Id64eaebeb8d5a97bbdf23a12f773c58a412b7277
| * | | | | net-test: build_rootfs - fix -n being ignored am: e9e18054c2Maciej enczykowski2019-03-211-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0ee596ee82 Change-Id: Icb5057d700d795fd121dbd033be80fc32632b0ab
| | * | | | net-test: build_rootfs - fix -n being ignoredMaciej enczykowski2019-03-211-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e9e18054c2 Change-Id: Ibc78572f6c183f44145d70f4b81fbb770a8feefa
| | | * | | net-test: build_rootfs - fix -n being ignoredMaciej Żenczykowski2019-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 126465735 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I8b980a5830e85cd5c4fd8d123c9911cfdf4daea7
* | | | | | [automerger skipped] Merge changes from topic "vts_kernel_net_test" into ↵Pierre Lee2019-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pie-vts-dev am: 1bc6e4fcff am: 03fd483c6c -s ours am: b9921e93cf Change-Id: I064bbe244789c8b5e946bc03a72971a95f4b68d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 13:21:53 +0000