Commit graph

63 commits

Author SHA1 Message Date
Steven Moreland
f5e4d7fb59 Update makefiles after native handle in Java.
Bug: 35098567
Test: N/A
Change-Id: I54b8d804e480cda09806f8028b966f28c4bd706e
2018-08-14 20:29:42 +00:00
Lorenzo Colitti
d14d8e4759 Fix OffloadControlHidlTestBase.AdditionalStopsWithInitReturnFalse
This test is testing that subsequent calls to stopOffload fail.
Therefore, don't fail if the first call fails. Only fail if the
subsequent calls fail

Bug: 77996655
Test: OffloadControlHidlTestBase.AdditionalStopsWithInitReturnFalse passes
Change-Id: I819a2942cc9bb2bca5cf0f603bb7e2b2b9b03d23
2018-05-11 17:02:42 +09:00
Lorenzo Colitti
5f9aec4f54 Add debugging to VtsHalTetherOffloadControl test.
1. Move the detailed failure statements from ALOGI statements to
   assertion failure messages.
2. Add SCOPED_TRACEs to AdditionalStopsWithInitReturnFalse.

Bug: 77996655
Test: Builds. Error messages visible in assertions.
Change-Id: Ife0607e792175ab22d1467b1fe2926107fee1e6a
2018-05-11 17:02:42 +09:00
Zhuoyao Zhang
5f6534b6b3 Merge "Convert tetheroffload hal test to use VtsHalHidlTargetTestEnvBase" am: 2ec93aed52
am: 016b793df7

Change-Id: Ie891a2eebdab5191976694cc9740448ef85a8fe6
2018-02-12 23:19:48 +00:00
Zhuoyao Zhang
b51d4b2fb0 Convert tetheroffload hal test to use VtsHalHidlTargetTestEnvBase
* This allow VTS to test tetheroffload hal against all service
  implmentations registered with different service name.

Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalTetherOffloadConfigV1_0Target
      vts-tradefed run vts -m VtsHalTetherOffloadControlV1_0Target

Change-Id: I0b4f3cf4abd3ffbd15cef7c2126ce6252a65a28e
2018-02-12 22:57:05 +00:00
Steven Moreland
e5c6548346 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:23:43 -08:00
Steven Moreland
8b76a6b90d Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:55 -08:00
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
Steven Moreland
c2f829a1d2 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 11:39:07 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Lorenzo Colitti
5b6e28f456 Don't expect stopOffload to succeed if interface doesn't exist.
am: 3189d9de81

Change-Id: I4c1a5cdf6694288c81497862faabe34a147ecbcc
2017-10-25 11:05:00 +00:00
Lorenzo Colitti
3189d9de81 Don't expect stopOffload to succeed if interface doesn't exist.
The AdditionalStopsWithInitReturnFalse test inits offload and
then checks that stopOffload returns true. However, the HAL is
allowed to return false to stopOffload if no upstream was ever
successfully programmed.

To ensure this test doesn't fail in the common case that the
interface is not up, don't expect stopOffload to return true in
this case.

Bug: 67439856
Test: VtsHalTetheroffloadControlV1_0TargetTest passes with and without mobile data connection
Change-Id: I245f9e3e4376a7799572a3b3967e2bf6c52b5e4d
2017-10-25 11:51:13 +09:00
Erik Kline
7bfd0f1f8a Fixup netlink socket creation to make corresponding fix in JNI
am: d97f8714f0

Change-Id: I864ab25fc8669205a93930ee80462bc40e9f11a4
2017-10-22 19:48:07 +00:00
Erik Kline
d97f8714f0 Fixup netlink socket creation to make corresponding fix in JNI
Corresponding JNI fix is:

    aosp/516339
    oc-mr1-dev:3102743

Test: as follows
    - built
    - flashed
    - booted
    - make vts -j30 BUILD_GOOGLE_VTS=true && \
      vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalTetherOffloadControlV1_0Target -l DEBUG

      10-20 17:48:28 I/ResultReporter: Invocation finished in 5m 32s. PASSED: 38, FAILED: 0, MODULES: 1 of 1

Bug: 68018148

Change-Id: I5aa019d708abaff61387b83a857e9e8226709842
2017-10-20 18:33:40 +09:00
Erik Kline
34eef5832e tetheroffload VTS: fix stopOffload test conditions
am: 15e945976b

Change-Id: Ibbd15fd40a396c9f3162f223d27f540b8527e706
2017-10-17 03:31:33 +00:00
Erik Kline
15e945976b tetheroffload VTS: fix stopOffload test conditions
The tetheroffload HAL is somewhat...and over- and under-specified.
A not unreasonable interpretation is that stopOffload() doesn't have
return success unless offload was actually started (via a call to
setUpstreamParameters()), and that after initOffload() and before
setUpstreamParameters() not actual "offload" has been engaged.

Precision in this matter is not required for the test case:

    OffloadControlHidlTestBase.AdditionalInitsWithoutStopReturnFalse

But for the test case:

    OffloadControlHidlTestBase.AdditionalStopsWithInitReturnFalse

we want to ensure the "matching" stopOffload call succeeds. For this
test we add in a call to setUpstreamParameters() for good measure.

Test: as follows
    prompt$ make vts -j30 BUILD_GOOGLE_VTS=true && \
            vts-tradefed run commandAndExit vts \
                --skip-all-system-status-check \
                --primary-abi-only \
                --skip-preconditions \
                --module VtsHalTetherOffloadControlV1_0Target \
                -l DEBUG

Observed:
    10-16 19:17:17 I/ResultReporter: Invocation finished in 1m 2s. PASSED: 38, FAILED: 0, MODULES: 1 of 1

Bug: 65270149
Bug: 65612227
Bug: 65612332
Change-Id: I924d41f5a20f07707e3d6991cb59d9c6b2b02339
2017-10-16 19:19:26 +09:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Erik Kline
67fd6d8af8 More tetheroffload VTS fixes for over-specified tests.
am: b451490514

Change-Id: I5aed0b84dd1c19a2ff5cd6eadf89bbc2e12c3ab5
2017-09-29 16:22:36 +00:00
Erik Kline
8b4c5b3b96 Tweaks to tetheroffload VTS: fixes and fd leaks
am: 62e3e4bd1a

Change-Id: I2091ae52a80cd45b6d8879e968e06827ea4594b2
2017-09-29 16:22:33 +00:00
Erik Kline
b451490514 More tetheroffload VTS fixes for over-specified tests.
[1] Call addDownstream before removeDownstream in affirmative tests

In order to properly test removeDownstream() where the HAL might
reasonably reject downstreams not previously added we now call
addDownstream() first (for affirmative tests).

[2] Clarify when stopOffload() return values can be safely ignored.

Test: as follows
    - make vts -j30 BUILD_GOOGLE_VTS=true && \
      vts-tradefed run commandAndExit vts \
          --skip-all-system-status-check \
          --primary-abi-only \
          --skip-preconditions \
          --module VtsHalTetherOffloadControlV1_0Target \
          -l DEBUG
      still doesn't pass but it's better than before  :)
Bug: 65270149
Change-Id: I27a574bd2110e3a1626de343f6b57b9efb8cdf83
2017-09-29 18:09:14 +09:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Erik Kline
62e3e4bd1a Tweaks to tetheroffload VTS: fixes and fd leaks
Specifically:
    - always use hidl_handle::setTo(..., true) to force fd ownership
      (and thereby cleanup in hidl_handle destructor)
    - initialize config HAL multiple times to try to trigger fd leaking bugs

Test: as follows
    - make vts -j30 BUILD_GOOGLE_VTS=true && \
      vts-tradefed run commandAndExit vts \
          --skip-all-system-status-check  \
          --primary-abi-only              \
          --skip-preconditions            \
          --module VtsHalTetherOffloadConfigV1_0Target -l INFO

      I/ResultReporter: Invocation finished in 48s. PASSED: 4, FAILED: 0, MODULES: 1 of 1

    - make vts -j30 BUILD_GOOGLE_VTS=true && \
      vts-tradefed run commandAndExit vts \
          --skip-all-system-status-check  \
          --primary-abi-only              \
          --skip-preconditions            \
          --module VtsHalTetherOffloadControlV1_0Target -l INFO
Bug: 29337859
Bug: 32163131
Bug: 64976634
Bug: 65270149
Bug: 65529504
Change-Id: Ib47b35a01092bb2052d241f7bba951bbf7691b66
2017-09-25 19:43:37 +09:00
Tri Vo
7c8d0871a9 Merge "Tetheroffload tests static link to HAL def libs." into oc-mr1-dev
am: b417e4c605

Change-Id: I14bc1b678620e2fd1b7d217eb2bb1309ce1714eb
2017-08-14 22:26:09 +00:00
Steven Moreland
4f25c2a143 Revert "Revert "Updating all makefiles.""
Relanding without automotive/vehicle/2.0+2.1 changes.

This reverts commit 1020ebedfb.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db
2017-08-11 23:02:01 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Steven Moreland
1020ebedfb Revert "Updating all makefiles."
This reverts commit 8ac1971678.

Reason for revert: Didn't remove automotive changes from this CL.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
2017-08-11 22:56:56 +00:00
Tri Vo
04c2a19598 Tetheroffload tests static link to HAL def libs.
Bug: 64040096
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalTetherOffloadControlV1_0Target
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalTetherOffloadConfigV1_0Target
Change-Id: Ib771c07646f3e219c7b9ba4be5515552d7fd6348
2017-08-11 14:53:16 -07:00
Steven Moreland
8ac1971678 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
2017-08-10 22:40:04 +00:00
Steven Moreland
65de66a67e Update makefiles for vndk enabled. am: 5e59402492 am: 271d53d836
am: 148ca84740

Change-Id: I5ef3611026b9c770bf713c14b9e01899a796e61c
2017-08-09 20:36:43 +00:00
Erik Kline
0999d3b76c Merge "Fix typo in in offload control VTS test" into oc-dr1-dev am: 5d77efddbd
am: 529ac5e0dc

Change-Id: Ia8bdbb971696764cac068639ca12248f5f5bde25
2017-08-09 02:11:04 +00:00
Erik Kline
529ac5e0dc Merge "Fix typo in in offload control VTS test" into oc-dr1-dev
am: 5d77efddbd

Change-Id: I1979717e6903576b3a4a2dbe60eaf1cdb9c2931d
2017-08-09 02:05:34 +00:00
Erik Kline
9fcc724692 Merge "Fix typo in in offload control VTS test" into oc-dr1-dev
am: 5d77efddbd

Change-Id: I2be944da8800040540bf98aeb197a933d1da0e42
2017-08-09 02:05:34 +00:00
Erik Kline
30a0746fb7 Fix typo in in offload control VTS test
Test: built, flashed, run
Bug: 38220415
Bug: 64479437
Change-Id: I3aa4afa3b52297dd92e37b4f39a5bd25b129ba04
2017-08-08 16:54:14 -07:00
Steven Moreland
5e59402492 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c307)
2017-08-08 17:09:10 +09:00
Erik Kline
4f6b7ca84f Merge "Refactor and expand tetheroffload Control and Config VTS" into oc-dr1-dev am: 6d5cf73b75
am: 75f78be32d

Change-Id: Ic8fb5dc095c42eb727f584cc31aaa945f495a01d
2017-08-08 04:07:18 +00:00
Tyler Wear
35354226fc Merge "Tetheroffload Control and Config VTS" into oc-dr1-dev am: a11e731b6e
am: c8466b3911

Change-Id: I83ac5baeeb584fed19fcba93ec3d676c163ef13a
2017-08-08 04:07:04 +00:00
Erik Kline
75f78be32d Merge "Refactor and expand tetheroffload Control and Config VTS" into oc-dr1-dev
am: 6d5cf73b75

Change-Id: I004e81a764313fdaf23f9580b144e1ee2ba79b27
2017-08-08 04:04:48 +00:00
Erik Kline
6816c11e82 Merge "Refactor and expand tetheroffload Control and Config VTS" into oc-dr1-dev
am: 6d5cf73b75

Change-Id: Ib52f5a2753655739bdbdbf7b10d3b15c57f31b77
2017-08-08 04:04:47 +00:00
Tyler Wear
c8466b3911 Merge "Tetheroffload Control and Config VTS" into oc-dr1-dev
am: a11e731b6e

Change-Id: I24712d426e1227b1f96cfa35f9f7b320e27fc901
2017-08-08 04:04:34 +00:00
Tyler Wear
6d429a8e6d Merge "Tetheroffload Control and Config VTS" into oc-dr1-dev
am: a11e731b6e

Change-Id: I4762dcac3ea365fe3d578929f6024381b271bc19
2017-08-08 04:04:34 +00:00