From 9d9c6f46fd51798be800b46ff4d58b9fff002a53 Mon Sep 17 00:00:00 2001 From: tracer-ysyx Date: Mon, 15 Jan 2024 22:22:48 +0800 Subject: [PATCH] =?UTF-8?q?>=20compile=20NEMU=20ysyx=5F22040000=20?= =?UTF-8?q?=E6=9D=8E=E5=BF=83=E6=9D=A8=20Linux=20calcite=206.1.71=20#1-Nix?= =?UTF-8?q?OS=20SMP=20PREEMPT=5FDYNAMIC=20Fri=20Jan=20=205=2014:18:41=20UT?= =?UTF-8?q?C=202024=20x86=5F64=20GNU/Linux=20=2022:22:48=20=20up=202=20day?= =?UTF-8?q?s=2011:17,=20=202=20users,=20=20load=20average:=200.21,=200.33,?= =?UTF-8?q?=200.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nemu/Makefile | 18 +++++++++--------- nemu/tests/Makefile | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/nemu/Makefile b/nemu/Makefile index 03c8a4e..0a52cf2 100644 --- a/nemu/Makefile +++ b/nemu/Makefile @@ -49,6 +49,15 @@ CFLAGS_TRACE += -DITRACE_COND=$(if $(CONFIG_ITRACE_COND),$(call remove_quote,$(C CFLAGS += $(CFLAGS_BUILD) $(CFLAGS_TRACE) -D__GUEST_ISA__=$(GUEST_ISA) LDFLAGS += $(CFLAGS_BUILD) +include $(NEMU_HOME)/tests/Makefile +all-tests: TEST_OBJS = $(filter-out $(OBJ_DIR)/src/nemu-main.o, $(OBJS)) +all-tests: CFLAGS += $(shell pkg-config --cflags check) +all-tests: LDFLAGS += $(shell pkg-config --libs check) +all-tests: $(TEST_SRCS:%.c=$(OBJ_DIR)/%) + +test: all-tests + @$(OBJ_DIR)/tests/expr_test + # Include rules for menuconfig include $(NEMU_HOME)/scripts/config.mk @@ -61,12 +70,3 @@ include $(NEMU_HOME)/scripts/native.mk endif .PHONY: test - -include $(NEMU_HOME)/tests/Makefile -all-tests: TEST_OBJS = $(filter-out $(OBJ_DIR)/src/nemu-main.o, $(OBJS)) -all-tests: CFLAGS += $(shell pkg-config --cflags check) -all-tests: LDFLAGS += $(shell pkg-config --libs check) -all-tests: $(TEST_SRCS:%.c=$(OBJ_DIR)/%) - -test: all-tests - @$(OBJ_DIR)/tests/expr_test diff --git a/nemu/tests/Makefile b/nemu/tests/Makefile index 386d705..6804b41 100644 --- a/nemu/tests/Makefile +++ b/nemu/tests/Makefile @@ -1,6 +1,5 @@ TEST_SRCS += tests/expr_test.c YACC = bison -INC_PATH += $(NEMU_HOME)/src/isa/$(GUEST_ISA)/local-include $(OBJ_DIR)/%: %.c $(TEST_OBJS) app @mkdir -p $(dir $@)