Skip to content

Commit

Permalink
refactor: create-machines as needed, cleanup Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
mpolitzer committed Apr 19, 2024
1 parent d1032e2 commit c6abeb4
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ ifeq ($(coverage),yes)
NUM_JOBS = 1
endif

CREATE_MACHINES_OPTS ?=
ifeq ($(rollup_init),yes)
CREATE_MACHINES_OPTS += --rollup-init
endif

COVERAGE_TOOLCHAIN?=gcc
COVERAGE_OUTPUT_DIR=$(BUILDDIR)/coverage
COVERAGE_WORKLOAD=\
Expand Down Expand Up @@ -92,7 +87,7 @@ CARTESI_IMAGES = $(CARTESI_IMAGES_PATH)/linux.bin
STYLUA=stylua
STYLUA_FLAGS=--indent-type Spaces --collapse-simple-statement Always

build-tests-all: misc build-tests-machine-with-toolchain build-tests-uarch-with-toolchain images create-machines
build-tests-all: misc build-tests-machine-with-toolchain build-tests-uarch-with-toolchain images $(CARTESI_CMIO_PATH)

build-tests-machine: machine riscv-tests

Expand Down Expand Up @@ -177,7 +172,8 @@ build-tests-misc-with-builder-image:
$(MAKE) emulator-builder-exec CONTAINER_COMMAND="make -j\$$(nproc) build-tests-misc"

create-machines $(CARTESI_CMIO_PATH): | $(CARTESI_IMAGES)
$(LUA) ./lua/create-machines.lua $(CREATE_MACHINES_OPTS)
@rm -rf $(CARTESI_CMIO_PATH)
$(LUA) ./lua/create-machines.lua

clean-machines:
@rm -rf $(CARTESI_CMIO_PATH)
Expand Down

0 comments on commit c6abeb4

Please sign in to comment.