Makefile: Rename targets test-crosvm-*-helloworld
Move the "KVM mode component" of these Make target names to their ends
so that they follow the format of the test-boot-* targets and allow for
easier future processing.
Bug: 195395681
Test: make test-crosvm-helloworld
Change-Id: Ie8323123c1557c297f505c7a2c5283a5f83da1cc
diff --git a/Makefile b/Makefile
index 69358c3..d3dd945 100644
--- a/Makefile
+++ b/Makefile
@@ -418,9 +418,9 @@
CROSVM_HELLOWORLD_SCRIPT_DIR := $(SCRIPTS_DIR)/crosvm/helloworld/
CROSVM_HELLOWORLD_LOG_DIR := $(DIST_DIR)/logs/crosvm/helloworld/
-CROSVM_HELLOWORLD_TESTS := test-crosvm-vhe-helloworld \
- test-crosvm-nvhe-helloworld \
- test-crosvm-pkvm-helloworld
+CROSVM_HELLOWORLD_TESTS := test-crosvm-helloworld-vhe \
+ test-crosvm-helloworld-nvhe \
+ test-crosvm-helloworld-pkvm
define gen_crosvm_helloworld_test
$(KUT_RUN_TEST) -d $(1) -M $(2) -t 300s \
@@ -445,14 +445,14 @@
test-list-crosvm-helloworld:
@ for x in $(CROSVM_HELLOWORLD_TESTS); do echo $x; done
-.PHONY: test-crosvm-vhe-helloworld
-test-crosvm-vhe-helloworld: $(KERNEL_IMAGE) $(UBOOT_BIN)
+.PHONY: test-crosvm-helloworld-vhe
+test-crosvm-helloworld-vhe: $(KERNEL_IMAGE) $(UBOOT_BIN)
@ $(call gen_crosvm_helloworld_test,$@,vhe)
-.PHONY: test-crosvm-nvhe-helloworld
-test-crosvm-nvhe-helloworld: $(KERNEL_IMAGE) $(UBOOT_BIN)
+.PHONY: test-crosvm-helloworld-nvhe
+test-crosvm-helloworld-nvhe: $(KERNEL_IMAGE) $(UBOOT_BIN)
@ $(call gen_crosvm_helloworld_test,$@,nvhe)
-.PHONY: test-crosvm-pkvm-helloworld
-test-crosvm-pkvm-helloworld: $(KERNEL_IMAGE) $(UBOOT_BIN)
+.PHONY: test-crosvm-helloworld-pkvm
+test-crosvm-helloworld-pkvm: $(KERNEL_IMAGE) $(UBOOT_BIN)
@ $(call gen_crosvm_helloworld_test,$@,pkvm)
