Remove coverage from test configurations.

Remove converage from test configs or entire config if not used
to define other test params. Tested each one individually to ensure
coverage still works.

Test: run vts -m (each test affected)
Change-Id: Ic1495a38ae9d1b32e851bc646f9c8e778eee2df1
This commit is contained in:
Ryan Campbell
2017-01-11 16:20:44 -08:00
parent a8d358fb63
commit f276d1923e
14 changed files with 3 additions and 150 deletions

View File

@@ -24,7 +24,6 @@
_32bit::DATA/nativetest/audio_effect_hidl_hal_test/audio_effect_hidl_hal_test,
_64bit::DATA/nativetest64/audio_effect_hidl_hal_test/audio_effect_hidl_hal_test,
"/>
<option name="test-config-path" value="vts/testcases/hal/audio/effect/hidl/target/HalAudioEffectHidlTargetBasicTest.config" />
<option name="binary-test-type" value="gtest" />
<option name="test-timeout" value="1m" />
</test>

View File

@@ -1,11 +0,0 @@
{
"use_gae_db": true,
"coverage": true,
"modules": [{
"module_name": "system/lib64/hw/android.hardware.audio.effect@2.0-impl",
"git_project": {
"name": "platform/hardware/interfaces",
"path": "hardware/interfaces"
}
}]
}

View File

@@ -24,7 +24,6 @@
_32bit::DATA/nativetest/light_hidl_hal_test/light_hidl_hal_test,
_64bit::DATA/nativetest64/light_hidl_hal_test/light_hidl_hal_test,
"/>
<option name="test-config-path" value="vts/testcases/hal/light/hidl/target/HalLightHidlTargetBasicTest.config" />
<option name="binary-test-type" value="gtest" />
<option name="test-timeout" value="1m" />
</test>

View File

@@ -1,33 +0,0 @@
{
"coverage": true,
"modules": [
{
"module_name": "system/lib64/hw/lights.bullhead",
"git_project": {
"name": "device/lge/bullhead",
"path": "device/lge/bullhead"
}
},
{
"module_name": "system/lib64/hw/lights.marlin",
"git_project": {
"name": "device/google/marlin",
"path": "device/google/marlin"
}
},
{
"module_name": "system/lib64/hw/lights.sailfish",
"git_project": {
"name": "device/google/marlin",
"path": "device/google/marlin"
}
},
{
"module_name": "system/lib64/hw/android.hardware.light@2.0-impl",
"git_project": {
"name": "platform/hardware/interfaces",
"path": "hardware/interfaces"
}
}
]
}

View File

@@ -24,7 +24,6 @@
_32bit::DATA/nativetest/memtrack_hidl_hal_test/memtrack_hidl_hal_test,
_64bit::DATA/nativetest64/memtrack_hidl_hal_test/memtrack_hidl_hal_test,
"/>
<option name="test-config-path" value="vts/testcases/hal/memtrack/hidl/target/HalMemtrackHidlTargetTest.config" />
<option name="binary-test-type" value="gtest" />
<option name="test-timeout" value="5m" />
</test>

View File

@@ -1,20 +0,0 @@
{
"use_gae_db": true,
"coverage": true,
"modules": [
{
"module_name": "system/lib64/hw/memtrack.msm8992",
"git_project": {
"name": "platform/hardware/qcom/display",
"path": "hardware/qcom/display"
}
},
{
"module_name": "system/lib64/hw/android.hardware.memtrack@1.0-impl",
"git_project": {
"name": "platform/hardware/interfaces",
"path": "hardware/interfaces"
}
}
]
}

View File

@@ -22,6 +22,7 @@ from vts.runners.host import asserts
from vts.runners.host import base_test_with_webdb
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
from vts.utils.python.coverage import coverage_utils
PASSTHROUGH_MODE_KEY = "passthrough_mode"
@@ -104,7 +105,7 @@ class NfcHidlBasicTest(base_test_with_webdb.BaseTestWithWebDbClass):
result = self.dut.hal.nfc.close()
logging.info("close result: %s", result)
self.SetCoverageData(self.dut.hal.nfc.GetRawCodeCoverage())
self.SetCoverageData(coverage_utils.GetGcdaDict(self.dut))
if __name__ == "__main__":
test_runner.main()

View File

@@ -1,11 +1,3 @@
{
"passthrough_mode": true,
"coverage": true,
"modules": [{
"module_name": "system/lib64/hw/nfc_nci.bullhead",
"git_project": {
"name": "platform/system/nfc",
"path": "system/nfc"
}
}]
"passthrough_mode": true
}

View File

@@ -24,7 +24,6 @@
_32bit::DATA/nativetest/nfc_hidl_hal_test/nfc_hidl_hal_test,
_64bit::DATA/nativetest64/nfc_hidl_hal_test/nfc_hidl_hal_test,
"/>
<option name="test-config-path" value="vts/testcases/hal/nfc/hidl/target/HalNfcHidlTargetBasicTest.config" />
<option name="binary-test-type" value="gtest" />
<option name="test-timeout" value="10m" />
</test>

View File

@@ -1,10 +0,0 @@
{
"coverage": true,
"modules": [{
"module_name": "system/lib64/hw/nfc_nci.bullhead",
"git_project": {
"name": "platform/system/nfc",
"path": "system/nfc"
}
}]
}

View File

@@ -24,7 +24,6 @@
_32bit::DATA/nativetest/power_hidl_hal_test/power_hidl_hal_test,
_64bit::DATA/nativetest64/power_hidl_hal_test/power_hidl_hal_test,
"/>
<option name="test-config-path" value="vts/testcases/hal/power/hidl/target/HalPowerHidlTargetTest.config" />
<option name="binary-test-type" value="gtest" />
<option name="test-timeout" value="1m" />
</test>

View File

@@ -1,34 +0,0 @@
{
"use_gae_db": true,
"coverage": true,
"modules": [
{
"module_name": "system/lib64/hw/power.bullhead",
"git_project": {
"name": "device/lge/bullhead",
"path": "device/lge/bullhead"
}
},
{
"module_name": "system/lib64/hw/power.marlin",
"git_project": {
"name": "device/google/marlin",
"path": "device/google/marlin"
}
},
{
"module_name": "system/lib64/hw/power.sailfish",
"git_project": {
"name": "device/google/marlin",
"path": "device/google/marlin"
}
},
{
"module_name": "system/lib64/hw/android.hardware.power@1.0-impl",
"git_project": {
"name": "platform/hardware/interfaces",
"path": "hardware/interfaces"
}
}
]
}

View File

@@ -26,8 +26,6 @@
"/>
<option name="binary-test-type" value="gtest" />
<option name="test-timeout" value="5m" />
<option name="test-config-path"
value="vts/testcases/hal/thermal/hidl/target/ThermalHidlBasicTest.config" />
</test>
</configuration>

View File

@@ -1,25 +0,0 @@
{
"use_gae_db": true,
"coverage": true,
"modules": [{
"module_name": "system/lib64/hw/thermal.bullhead",
"git_project": {
"name": "device/lge/bullhead",
"path": "device/lge/bullhead"
}
},
{
"module_name": "system/lib64/hw/thermal.marlin",
"git_project": {
"name": "device/google/marlin",
"path": "device/google/marlin"
}
},
{
"module_name": "system/lib64/hw/android.hardware.thermal@1.0-impl",
"git_project": {
"name": "platform/hardware/interfaces",
"path": "hardware/interfaces"
}
}]
}