Refactor verify_overlaps to make it testable and add tests for the comparison. It does make one significant change in behavior which is to read each of the files produced by a bootclasspath_fragment into a dict before comparison, rather than reading and comparing them a row at a time. That allows it to reuse the code to read a CSV into a dict. Bug: 194063708 Test: atest --host verify_overlaps_test m out/soong/hiddenapi/hiddenapi-flags.csv - manually change files to cause difference in flags to check that it detects the differences. Change-Id: Ib70ac87fe089fc25e3bef18f367d4939bfc0cb8d
107 lines
2.3 KiB
Plaintext
107 lines
2.3 KiB
Plaintext
/*
|
|
* Copyright (C) 2020 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 {
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
python_binary_host {
|
|
name: "merge_csv",
|
|
main: "merge_csv.py",
|
|
srcs: ["merge_csv.py"],
|
|
version: {
|
|
py2: {
|
|
enabled: false,
|
|
},
|
|
py3: {
|
|
enabled: true,
|
|
embedded_launcher: true,
|
|
},
|
|
},
|
|
}
|
|
|
|
python_binary_host {
|
|
name: "generate_hiddenapi_lists",
|
|
main: "generate_hiddenapi_lists.py",
|
|
srcs: ["generate_hiddenapi_lists.py"],
|
|
version: {
|
|
py2: {
|
|
enabled: false,
|
|
},
|
|
py3: {
|
|
enabled: true,
|
|
embedded_launcher: true,
|
|
},
|
|
},
|
|
}
|
|
|
|
python_test_host {
|
|
name: "generate_hiddenapi_lists_test",
|
|
main: "generate_hiddenapi_lists_test.py",
|
|
srcs: [
|
|
"generate_hiddenapi_lists.py",
|
|
"generate_hiddenapi_lists_test.py",
|
|
],
|
|
version: {
|
|
py2: {
|
|
enabled: false,
|
|
},
|
|
py3: {
|
|
enabled: true,
|
|
embedded_launcher: true,
|
|
},
|
|
},
|
|
test_options: {
|
|
unit_test: true,
|
|
},
|
|
}
|
|
|
|
python_binary_host {
|
|
name: "verify_overlaps",
|
|
main: "verify_overlaps.py",
|
|
srcs: ["verify_overlaps.py"],
|
|
version: {
|
|
py2: {
|
|
enabled: false,
|
|
},
|
|
py3: {
|
|
enabled: true,
|
|
embedded_launcher: true,
|
|
},
|
|
},
|
|
}
|
|
|
|
python_test_host {
|
|
name: "verify_overlaps_test",
|
|
main: "verify_overlaps_test.py",
|
|
srcs: [
|
|
"verify_overlaps.py",
|
|
"verify_overlaps_test.py",
|
|
],
|
|
version: {
|
|
py2: {
|
|
enabled: false,
|
|
},
|
|
py3: {
|
|
enabled: true,
|
|
embedded_launcher: true,
|
|
},
|
|
},
|
|
test_options: {
|
|
unit_test: true,
|
|
},
|
|
}
|