openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Rename vts-core to vts" am: 488d665d7d am: 4a07600e20 

Change-Id: Ib75a89a887f20ecef78047391b5a648f462bff26
This commit is contained in:
Dan Shi 2020-04-03 23:24:39 +00:00 committed by Automerger Merge Worker
parent 4e25730e1a 4a07600e20
commit afe347208a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/tasks/general-tests.mk
View File

@ -18,7 +18,7 @@
general_tests_tools := \ general_tests_tools := \
$(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \
$(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \
$(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed.jar \ $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar \
$(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar
intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests) intermediates_dir := $(call intermediates-dir-for,PACKAGING,general-tests)

17
core/tasks/vts-core-tests.mk
View File

@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
test_suite_name := vts-core test_suite_name := vts
test_suite_tradefed := vts-core-tradefed test_suite_tradefed := vts-tradefed
test_suite_readme := test/vts/tools/vts-core-tradefed/README test_suite_readme := test/vts/tools/vts-core-tradefed/README
# TODO(b/149249068): Clean up after all VTS tests are converted. # TODO(b/149249068): Clean up after all VTS tests are converted.
@ -23,9 +23,14 @@ vts_test_artifact_paths :=
include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
.PHONY: vts-core .PHONY: vts
$(compatibility_zip): $(vts_test_artifact_paths) $(compatibility_zip): $(vts_test_artifact_paths)
vts-core: $(compatibility_zip) vts: $(compatibility_zip)
$(call dist-for-goals, vts-core, $(compatibility_zip)) $(call dist-for-goals, vts, $(compatibility_zip))
tests: vts-core # TODO(b/149249068): Remove vts-core phony target after it's removed from all
# builders.
.PHONY: vts-core
vts-core: vts
tests: vts