p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Additionally run releasetools_test with Python 3. 

Bug: 131631303
Test: TreeHugger
Test: `atest releasetools_test`
Test: `atest releasetools_py3_test`
Change-Id: Ie00f48835aae41bc69ab8554b856a62aa3b497cc
This commit is contained in:
Tao Bao 2019-05-01 21:58:03 -07:00
parent 6e3ae4e849
commit ca82fc90f7
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/releasetools/Android.bp
View File

@ -13,21 +13,22 @@
// limitations under the License. // limitations under the License.
python_defaults { python_defaults {
name: "releasetools_test_defaults", name: "releasetools_defaults",
version: { version: {
py2: { py2: {
enabled: true, enabled: true,
embedded_launcher: false, embedded_launcher: false,
}, },
py3: { py3: {
enabled: false, enabled: true,
embedded_launcher: false,
}, },
}, },
} }
python_library_host { python_library_host {
name: "releasetools_lib", name: "releasetools_lib",
defaults: ["releasetools_test_defaults"], defaults: ["releasetools_defaults"],
srcs: [ srcs: [
"add_img_to_target_files.py", "add_img_to_target_files.py",
"apex_utils.py", "apex_utils.py",
@ -53,10 +54,9 @@ python_library_host {
], ],
} }
python_test_host { python_defaults {
name: "releasetools_test", name: "releasetools_test_defaults",
defaults: ["releasetools_test_defaults"], defaults: ["releasetools_defaults"],
main: "test_utils.py",
srcs: [ srcs: [
"test_*.py", "test_*.py",
], ],
@ -69,5 +69,38 @@ python_test_host {
required: [ required: [
"otatools", "otatools",
], ],
}
python_test_host {
name: "releasetools_test",
defaults: ["releasetools_test_defaults"],
main: "test_utils.py",
version: {
py2: {
enabled: true,
embedded_launcher: false,
},
py3: {
enabled: false,
embedded_launcher: false,
},
},
test_suites: ["general-tests"],
}
python_test_host {
name: "releasetools_py3_test",
defaults: ["releasetools_test_defaults"],
main: "test_utils.py",
version: {
py2: {
enabled: false,
embedded_launcher: false,
},
py3: {
enabled: true,
embedded_launcher: false,
},
},
test_suites: ["general-tests"], test_suites: ["general-tests"],
} }

4
tools/releasetools/TEST_MAPPING
View File

@ -3,6 +3,10 @@
{ {
"name": "releasetools_test", "name": "releasetools_test",
"host": true "host": true
},
{
"name": "releasetools_py3_test",
"host": true
} }
] ]
} }