1ed8affa72
Currently, there are some test for classes that are not in connectivity module. If the platform code has a new change that the test depends on it, then the test cannot verify the behavior since the change does not exist in module branch. This change moves the test for non-module classes out of FrameworksNetTestsLib so that it doesn't go into coverage tests. Then add those tests to FrameworksNetTests and use a variable to enable/disable FrameworksNetTests which could minimize merge conflicts. Bug: 201265286 Test: make FrameworksNetTests Change-Id: Ia9669da2c4d79054710e7f4173bc960e3f77f45a
55 lines
1.8 KiB
Plaintext
55 lines
1.8 KiB
Plaintext
//
|
|
// Copyright (C) 2019 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
package {
|
|
// See: http://go/android-license-faq
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
// FrameworksNetDeflakeTest depends on FrameworksNetTests so it should be disabled
|
|
// if FrameworksNetTests is disabled.
|
|
enable_frameworks_net_deflake_test = true
|
|
// Placeholder
|
|
// This is a placeholder comment to minimize merge conflicts, as enable_frameworks_net_deflake_test
|
|
// may have different values depending on the branch
|
|
// Placeholder
|
|
|
|
java_test_host {
|
|
name: "FrameworksNetDeflakeTest",
|
|
enabled: enable_frameworks_net_deflake_test,
|
|
srcs: ["src/**/*.kt"],
|
|
libs: [
|
|
"junit",
|
|
"tradefed",
|
|
],
|
|
static_libs: [
|
|
"kotlin-test",
|
|
"net-host-tests-utils",
|
|
],
|
|
data: [":FrameworksNetTests"],
|
|
test_suites: ["device-tests"],
|
|
// It will get build error if just set enabled to true. It fails with "windows_common"
|
|
// depends on some disabled modules that are used by this test and it looks like set
|
|
// enable_frameworks_net_deflake_test to true also enables "windows" variant. Thus,
|
|
// disable this on target windows.
|
|
// TODO: Remove this when b/201754360 is fixed.
|
|
target: {
|
|
windows: {
|
|
enabled: false,
|
|
},
|
|
},
|
|
}
|