Skip to content

Commit d18fcaf

Browse files
committed
Fix 'make test', add 'make build', 'make clean'
The CLI tests require 'bin/<os-arch>/glc' binary to be built in order to run 'glj ...' commands and test the output.
1 parent 8a1ff0f commit d18fcaf

1 file changed

Lines changed: 30 additions & 1 deletion

File tree

Makefile

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,28 @@ STDLIB := $(STDLIB_ORIGINALS:scripts/rewrite-core/originals/%=%)
66
STDLIB_ORIGINALS := $(addprefix scripts/rewrite-core/originals/,$(STDLIB))
77
STDLIB_TARGETS := $(addprefix pkg/stdlib/glojure/,$(STDLIB:.clj=.glj))
88

9+
OS-TYPE := $(shell bash -c 'echo $$OSTYPE')
10+
OS-NAME := \
11+
$(if $(findstring darwin,$(OS-TYPE))\
12+
,macos,$(if $(findstring linux,$(OS-TYPE)),linux,))
13+
ARCH-TYPE := $(shell bash -c 'echo $$MACHTYPE')
14+
ARCH-NAME := \
15+
$(if $(or $(findstring arm64,$(ARCH-TYPE)),\
16+
$(findstring aarch64,$(ARCH-TYPE)))\
17+
,arm64,$(if $(findstring x86_64,$(ARCH-TYPE)),int64,))
18+
19+
ifdef OS-NAME
20+
ifdef ARCH-NAME
21+
OS-ARCH := $(OS-NAME)-$(ARCH-NAME)
22+
OA-linux-arm64 := linux_arm64
23+
OA-linux-int64 := linux_amd64
24+
OA-macos-arm64 := darwin_arm64
25+
OA-macos-int64 := darwin_amd64
26+
OA := $(OA-$(OS-ARCH))
27+
GLJ := bin/$(OA)/glj
28+
endif
29+
endif
30+
931
TEST_FILES := $(shell find ./test -name '*.glj' | sort)
1032
TEST_TARGETS := $(addsuffix .test,$(TEST_FILES))
1133

@@ -31,6 +53,13 @@ gocmd:
3153
generate:
3254
@go generate ./...
3355

56+
.PHONY: build
57+
build: $(GLJ)
58+
59+
.PHONY: clean
60+
clean:
61+
$(RM) -r bin/
62+
3463
pkg/gen/gljimports/gljimports_%.go: ./scripts/gen-gljimports.sh ./cmd/gen-import-interop/main.go ./internal/genpkg/genpkg.go \
3564
$(wildcard ./pkg/lang/*.go) $(wildcard ./pkg/runtime/*.go)
3665
@echo "Generating $@"
@@ -56,7 +85,7 @@ vet:
5685
@go vet ./...
5786

5887
.PHONY: $(TEST_TARGETS)
59-
$(TEST_TARGETS): gocmd
88+
$(TEST_TARGETS): gocmd $(GLJ)
6089
@$(GO_CMD) run ./cmd/glj/main.go $(basename $@)
6190

6291
.PHONY: test

0 commit comments

Comments
 (0)