From 9c295b4415a0d91adc9e6c49b20ab60dc1644092 Mon Sep 17 00:00:00 2001 From: Simran Basi Date: Thu, 16 Feb 2017 11:49:18 -0800 Subject: [PATCH] Add device-tests and general-tests make targets. Adds the device-tests and general-tests makefiles and added include lines to main.mk so that individual test modules can be built properly. These targets do not build any special tradefed wrapper that normal *TS's usually employ. They are not necessary here. Bug: 35350788 Test: Updated several CTS test modules to belong to these suites instead and ran: `rm -rf out; make clean; make device-tests general-tests -j` then verified the output. Change-Id: I40e3958375f7b39cb56508f2812ce9760d403f6f --- core/main.mk | 4 ++++ core/tasks/device-tests.mk | 17 +++++++++++++++++ core/tasks/general-tests.mk | 16 ++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 core/tasks/device-tests.mk create mode 100644 core/tasks/general-tests.mk diff --git a/core/main.mk b/core/main.mk index dff0163da..c131ed2cb 100644 --- a/core/main.mk +++ b/core/main.mk @@ -90,6 +90,10 @@ endif -include cts/build/config.mk # VTS-specific config. -include test/vts/tools/vts-tradefed/build/config.mk +# device-tests-specific-config. +-include tools/tradefederation/build/suites/device-tests/config.mk +# general-tests-specific-config. +-include tools/tradefederation/build/suites/general-tests/config.mk # This allows us to force a clean build - included after the config.mk # environment setup is done, but before we generate any dependencies. This diff --git a/core/tasks/device-tests.mk b/core/tasks/device-tests.mk new file mode 100644 index 000000000..a0662ca75 --- /dev/null +++ b/core/tasks/device-tests.mk @@ -0,0 +1,17 @@ +# Copyright (C) 2017 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 agrls eed 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. + + +.PHONY: device-tests +device-tests: $(COMPATIBILITY.device-tests.FILES) diff --git a/core/tasks/general-tests.mk b/core/tasks/general-tests.mk new file mode 100644 index 000000000..ddaede409 --- /dev/null +++ b/core/tasks/general-tests.mk @@ -0,0 +1,16 @@ +# Copyright (C) 2017 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 agrls eed 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. + +.PHONY: general-tests +device-tests: $(COMPATIBILITY.general-tests.FILES) -- 2.11.0