Add wrapper for prebuilt QEMU
Avoid having to set LD_LIBRARY_PATH in the Makefile by adding a wrapper
for prebuilt QEMU that handles it transparently to the caller.
Change-Id: Ib3951055a0682bf302882059c79a796b2b8a242b
diff --git a/Makefile b/Makefile
index c7a8db5..ee8665a 100644
--- a/Makefile
+++ b/Makefile
@@ -210,8 +210,7 @@
JOBS := "1"
endif
-KUT_QEMU_BIN := $(ROOT_DIR)/prebuilts/linux-x86/qemu/bin/qemu-system-aarch64
-KUT_QEMU_LIB := $(ROOT_DIR)/prebuilts/linux-x86/qemu/lib
+KUT_QEMU_BIN := $(ROOT_DIR)/prebuilts/linux-x86/qemu/bin/qemu-system-aarch64.sh
KUT_ROOTFS_IMAGE := $(ROOT_DIR)/prebuilts/linux-aarch64/images/rootfs.ext4
# Exclude tests that require user interaction or are known to fail.
@@ -219,7 +218,7 @@
.PHONY: test
test: kvm-unit-tests linux_image
- @LD_LIBRARY_PATH=$(KUT_QEMU_LIB):$(LD_LIBRARY_PATH) VERBOSE=$(VERBOSE) \
+ @VERBOSE=$(VERBOSE) \
$(TEST_SCRIPTS_DIR)/run_tests.sh \
-j $(JOBS) \
-t $(KUT_OUT)/tests/ \
