Integrate test-spec

.gitignore

@@ -1,4 +1,5 @@
 build/*
+!build/tup.config
 _*
 \#*
 \.\#*

Makefile

@@ -1,7 +1,8 @@
-BOOT_NAME=boot
+BOOT_NAME=mi-boot
 MI_LITE_NAME=mi-lite
 MI_MID_NAME=mi-mid
 MI_NAME=mi
+MI_CHEAT_NAME=mi-cheat
 
 BIN_PATH=$(HOME)/.local/bin
 LIB_PATH=$(HOME)/.local/lib/mcore
@@ -14,23 +15,19 @@ SET_OCAMLPATH=OCAMLPATH=$(current_dir)/build/lib
 .PHONY: default
 default: bootstrap
 
-# Misc and cleanup
-
-build:
-	mkdir -p build
-
 # NOTE(vipa, 2023-03-29): This removes all ignored files, which
 # should coincide with generated files
 .PHONY: clean
 clean:
-	rm -rf $$(misc/repo-ignored-files)
+	bash -c 'mapfile -t args < <(misc/repo-ignored-files); rm -rf "$${args[@]}"'
+	find build -depth -type d -empty -delete
 
 # The OCaml library and executables (`boot`)
 
 .PHONY: boot
 boot: build/$(BOOT_NAME)
-build/$(BOOT_NAME): build $(shell find src/boot/ -type f)
-	misc/with-tmp-dir dune build --root=src/boot/ --build-dir="{}" "&&" dune install --prefix="{}/install-prefix" --root=src/boot/ --bindir=`pwd`/build --libdir=`pwd`/build/lib ">/dev/null" "2>&1"
+build/$(BOOT_NAME): $(shell find src/boot/ -type f)
+	misc/with-tmp-dir dune build --root=src/boot/ --build-dir="{}" "&&" dune install --build-dir="{}" --prefix="{}/install-prefix" --root=src/boot/ --libdir=`pwd`/build/lib ">/dev/null" "2>&1" "&&" mv "{}/install-prefix/bin/boot" $@
 
 .PHONY: install-boot
 install-boot:
@@ -60,6 +57,11 @@ build/$(MI_MID_NAME): build/$(MI_LITE_NAME)
 build/$(MI_NAME): build/$(MI_MID_NAME)
 	$(SET_STDLIB) $(SET_OCAMLPATH) time build/$(MI_MID_NAME) compile src/main/mi.mc --output build/$(MI_NAME)
 
+.PHONY: cheat
+cheat: build/$(MI_CHEAT_NAME)
+build/$(MI_CHEAT_NAME): build/$(BOOT_NAME)
+	$(SET_STDLIB) $(SET_OCAMLPATH) time mi compile src/main/mi.mc --output build/$(MI_CHEAT_NAME)
+
 # Installing and uninstalling `mi` and the standard library
 
 .PHONY: install
@@ -71,22 +73,20 @@ install: build/$(MI_NAME) install-boot
 
 .PHONY: uninstall
 uninstall:
-	cd src/boot && dune uninstall
+	misc/with-tmp-dir dune uninstall --build-dir="{}" --root=src/boot
 	rm -f $(BIN_PATH)/$(MI_NAME)
 	rm -rf $(LIB_PATH)/stdlib
 
-# Basic testing (for more granular control, use `misc/test` directly)
+# Basic testing (for more granular control, use `misc/test` directly,
+# or `misc/watch` to autorun tests when files change)
 
 .PHONY: test test-all test-quick
+test test-all test-quick: $(if $(wildcard .tup/.),,build/$(MI_NAME))
 test:
-	misc/test smart
+	exec misc/test --bootstrapped smart
 
 test-all:
-	misc/test all
+	exec misc/test --bootstrapped all
 
 test-quick:
-	misc/test
-
-# TODO(vipa, 2023-03-28): write two things:
-# - .mc program that outputs commands on how to build/run all tests, and does dependency checking
-# - A shell script `misc/test` that evals the .mc program appropriately
+	exec misc/test --bootstrapped