commit be90d3ef6c602f24f2fa9cfb0f11fd2988f33086
author David Brazdil <dbrazdil@google.com> Wed Mar 10 22:54:28 2021 +0000
committer David Brazdil <dbrazdil@google.com> Thu Mar 11 08:44:59 2021 +0000
tree fb2415ad6484246d4ff1e2f45d9db961d21e79f5
parent 4efc37a27e3aa45f67ad50c138e2448d2eacb52b

Simplify crosvm-helloworld test params

-M is used three times

Test: make test
Change-Id: If2d1cafebb90136a8d0bf35e61e1983018839763

Makefile

diff --git a/Makefile b/Makefile
index 58978c5..ddb1982 100644
--- a/Makefile
+++ b/Makefile
@@ -405,7 +405,7 @@
 			   test-crosvm-pkvm-helloworld
 
 define gen_crosvm_helloworld_test
-	$(KUT_RUN_TEST) -d $(1) $(2) -t 300s \
+	$(KUT_RUN_TEST) -d $(1) -M $(2) -t 300s \
 		-k $(KERNEL_IMAGE) \
 		-F $(UBOOT_BIN) \
 		-o $(CROSVM_HELLOWORLD_LOG_DIR)/$(1).log \
@@ -428,12 +428,12 @@
 
 .PHONY: test-crosvm-vhe-helloworld
 test-crosvm-vhe-helloworld: $(KERNEL_IMAGE) $(UBOOT_BIN)
-	@ $(call gen_crosvm_helloworld_test,$@,-M vhe)
+	@ $(call gen_crosvm_helloworld_test,$@,vhe)
 
 .PHONY: test-crosvm-nvhe-helloworld
 test-crosvm-nvhe-helloworld: $(KERNEL_IMAGE) $(UBOOT_BIN)
-	@ $(call gen_crosvm_helloworld_test,$@,-M nvhe)
+	@ $(call gen_crosvm_helloworld_test,$@,nvhe)
 
 .PHONY: test-crosvm-pkvm-helloworld
 test-crosvm-pkvm-helloworld: $(KERNEL_IMAGE) $(UBOOT_BIN)
-	@ $(call gen_crosvm_helloworld_test,$@,-M pkvm)
+	@ $(call gen_crosvm_helloworld_test,$@,pkvm)