X-Git-Url: https://git.hcoop.net/jackhill/mal.git/blobdiff_plain/9f21caf3887837c2963187d7a6845910d7d97e99..bdc6b386be50f6ea7c6fb995bcdb4b2bd92bc959:/Makefile diff --git a/Makefile b/Makefile index 22cc857d..3cc5441b 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,19 @@ MAL_IMPL = js PYTHON = python +# Extra options to pass to runtest.py +TEST_OPTS = + +# Extra implementation specific options to pass to runtest.py +mal_TEST_OPTS = --start-timeout 60 --test-timeout 120 + # # Settings # -IMPLS = bash c clojure coffee cpp cs erlang factor forth go haskell java \ - julia js lua make mal ocaml matlab miniMAL nim perl php ps \ - python r racket ruby rust scala swift vb guile +IMPLS = awk bash c clojure coffee cpp crystal cs erlang elixir es6 factor forth fsharp go groovy \ + guile haskell java julia js kotlin lua make mal ocaml matlab miniMAL nim \ + perl php ps python r racket rpython ruby rust scala swift vb vimscript step0 = step0_repl step1 = step1_read_print @@ -26,11 +32,14 @@ step8 = step8_macros step9 = step9_try stepA = stepA_mal +EXCLUDE_TESTS += test^awk^step5 # completes at 10,000 EXCLUDE_TESTS += test^bash^step5 # no stack exhaustion or completion EXCLUDE_TESTS += test^c^step5 # segfault EXCLUDE_TESTS += test^cpp^step5 # completes at 10,000 EXCLUDE_TESTS += test^cs^step5 # fatal stack overflow fault EXCLUDE_TESTS += test^erlang^step5 # erlang is TCO, test passes +EXCLUDE_TESTS += test^elixir^step5 # elixir is TCO, test passes +EXCLUDE_TESTS += test^fsharp^step5 # completes at 10,000, fatal stack overflow at 100,000 EXCLUDE_TESTS += test^haskell^step5 # test completes EXCLUDE_TESTS += test^make^step5 # no TCO capability/step EXCLUDE_TESTS += test^mal^step5 # no TCO capability/step @@ -43,6 +52,7 @@ EXCLUDE_TESTS += test^ruby^step5 # test completes, even at 100,000 EXCLUDE_TESTS += test^rust^step5 # no catching stack overflows EXCLUDE_TESTS += test^ocaml^step5 # test completes, even at 1,000,000 EXCLUDE_TESTS += test^vb^step5 # completes at 10,000 +EXCLUDE_TESTS += test^crystal^step5 # test completes, even at 1,000,000 EXCLUDE_PERFS = perf^mal # TODO: fix this @@ -52,20 +62,27 @@ EXCLUDE_PERFS = perf^mal # TODO: fix this STEP_TEST_FILES = $(strip $(wildcard $(1)/tests/$($(2)).mal) $(wildcard tests/$($(2)).mal)) +awk_STEP_TO_PROG = awk/$($(1)).awk bash_STEP_TO_PROG = bash/$($(1)).sh c_STEP_TO_PROG = c/$($(1)) clojure_STEP_TO_PROG = clojure/src/$($(1)).clj coffee_STEP_TO_PROG = coffee/$($(1)).coffee cpp_STEP_TO_PROG = cpp/$($(1)) +crystal_STEP_TO_PROG = crystal/$($(1)) cs_STEP_TO_PROG = cs/$($(1)).exe +elixir_STEP_TO_PROG = elixir/lib/mix/tasks/$($(1)).ex erlang_STEP_TO_PROG = erlang/$($(1)) +es6_STEP_TO_PROG = es6/build/$($(1)).js factor_STEP_TO_PROG = factor/src/$($(1))/$($(1)).factor forth_STEP_TO_PROG = forth/$($(1)).fs +fsharp_STEP_TO_PROG = fsharp/$($(1)).exe go_STEP_TO_PROG = go/$($(1)) +groovy_STEP_TO_PROG = groovy/$($(1)).groovy java_STEP_TO_PROG = java/src/main/java/mal/$($(1)).java haskell_STEP_TO_PROG = haskell/$($(1)) julia_STEP_TO_PROG = julia/$($(1)).jl js_STEP_TO_PROG = js/$($(1)).js +kotlin_STEP_TO_PROG = kotlin/$($(1)).jar lua_STEP_TO_PROG = lua/$($(1)).lua make_STEP_TO_PROG = make/$($(1)).mk mal_STEP_TO_PROG = mal/$($(1)).mal @@ -79,11 +96,13 @@ ps_STEP_TO_PROG = ps/$($(1)).ps python_STEP_TO_PROG = python/$($(1)).py r_STEP_TO_PROG = r/$($(1)).r racket_STEP_TO_PROG = racket/$($(1)).rkt +rpython_STEP_TO_PROG = rpython/$($(1)) ruby_STEP_TO_PROG = ruby/$($(1)).rb rust_STEP_TO_PROG = rust/target/release/$($(1)) scala_STEP_TO_PROG = scala/$($(1)).scala swift_STEP_TO_PROG = swift/$($(1)) vb_STEP_TO_PROG = vb/$($(1)).exe +vimscript_STEP_TO_PROG = vimscript/$($(1)).vim guile_STEP_TO_PROG = guile/$($(1)).scm # Needed some argument munging @@ -92,23 +111,30 @@ noop = SPACE = $(noop) $(noop) export FACTOR_ROOTS := src +awk_RUNSTEP = awk -O -f ../$(2) $(3) bash_RUNSTEP = bash ../$(2) $(3) c_RUNSTEP = ../$(2) $(3) clojure_RUNSTEP = lein with-profile +$(1) trampoline run $(3) coffee_RUNSTEP = coffee ../$(2) $(3) cpp_RUNSTEP = ../$(2) $(3) +crystal_RUNSTEP = ../$(2) $(3) cs_RUNSTEP = mono ../$(2) --raw $(3) +elixir_RUNSTEP = mix $(notdir $(basename $(2))) $(3) erlang_RUNSTEP = ../$(2) $(3) +es6_RUNSTEP = node ../$(2) $(3) factor_RUNSTEP = factor ../$(2) $(3) forth_RUNSTEP = gforth ../$(2) $(3) +fsharp_RUNSTEP = mono ../$(2) --raw $(3) go_RUNSTEP = ../$(2) $(3) +groovy_RUNSTEP = groovy ../$(2) $(3) haskell_RUNSTEP = ../$(2) $(3) java_RUNSTEP = mvn -quiet exec:java -Dexec.mainClass="mal.$($(1))" $(if $(3), -Dexec.args="$(3)",) julia_RUNSTEP = ../$(2) $(3) js_RUNSTEP = node ../$(2) $(3) +kotlin_RUNSTEP = java -jar ../$(2) $(3) lua_RUNSTEP = ../$(2) $(3) make_RUNSTEP = make -f ../$(2) $(3) -mal_RUNSTEP = $(call $(MAL_IMPL)_RUNSTEP,$(1),$(call $(MAL_IMPL)_STEP_TO_PROG,stepA),../$(2),") #" +mal_RUNSTEP = $(call $(MAL_IMPL)_RUNSTEP,stepA,$(call $(MAL_IMPL)_STEP_TO_PROG,stepA),../$(2),") #" ocaml_RUNSTEP = ../$(2) $(3) matlab_args = $(subst $(SPACE),$(COMMA),$(foreach x,$(strip $(1)),'$(x)')) matlab_RUNSTEP = matlab -nodisplay -nosplash -nodesktop -nojvm -r "$($(1))($(call matlab_args,$(3)));quit;" @@ -116,21 +142,25 @@ miniMAL_RUNSTEP = miniMAL ../$(2) $(3) nim_RUNSTEP = ../$(2) $(3) perl_RUNSTEP = perl ../$(2) $(3) php_RUNSTEP = php ../$(2) $(3) -ps_RUNSTEP = $(4)gs -q -I./ -dNODISPLAY -- ../$(2) $(3)$(4) +ps_RUNSTEP = gs -q -I./ -dNODISPLAY -- ../$(2) $(3) python_RUNSTEP = $(PYTHON) ../$(2) $(3) r_RUNSTEP = Rscript ../$(2) $(3) racket_RUNSTEP = ../$(2) $(3) +rpython_RUNSTEP = ../$(2) $(3) ruby_RUNSTEP = ruby ../$(2) $(3) rust_RUNSTEP = ../$(2) $(3) scala_RUNSTEP = sbt 'run-main $($(1))$(if $(3), $(3),)' swift_RUNSTEP = ../$(2) $(3) vb_RUNSTEP = mono ../$(2) --raw $(3) +vimscript_RUNSTEP = ./run_vimscript.sh ../$(2) $(3) # needs TERM=dumb to work with readline -guile_RUNSTEP = guile -L ../guile ../$(2) $(3) +guile_RUNSTEP = guile --no-auto-compile -L ../guile ../$(2) $(3) -# Extra options to pass to runtest.py -mal_TEST_OPTS = --start-timeout 60 --test-timeout 120 +vimscript_TEST_OPTS = --test-timeout 30 +ifeq ($(MAL_IMPL),vimscript) +mal_TEST_OPTS = --start-timeout 60 --test-timeout 180 +endif # Derived lists STEPS = $(sort $(filter step%,$(.VARIABLES))) @@ -145,18 +175,16 @@ ALL_TESTS = $(filter-out $(EXCLUDE_TESTS),\ IMPL_STATS = $(foreach impl,$(DO_IMPLS),stats^$(impl)) IMPL_STATS_LISP = $(foreach impl,$(DO_IMPLS),stats-lisp^$(impl)) +DOCKER_BUILD = $(foreach impl,$(DO_IMPLS),docker-build^$(impl)) + IMPL_PERF = $(filter-out $(EXCLUDE_PERFS),$(foreach impl,$(DO_IMPLS),perf^$(impl))) # # Build rules # -# Build a program in 'c' directory -c/%: - $(MAKE) -C $(dir $(@)) $(notdir $(@)) - -# Build a program in 'cpp' directory -cpp/%: +# Build a program in an implementation directory +$(foreach i,$(DO_IMPLS),$(foreach s,$(STEPS),$(call $(i)_STEP_TO_PROG,$(s)))): $(MAKE) -C $(dir $(@)) $(notdir $(@)) # Allow test, test^STEP, test^IMPL, and test^IMPL^STEP @@ -174,8 +202,8 @@ $(ALL_TESTS): $$(call $$(word 2,$$(subst ^, ,$$(@)))_STEP_TO_PROG,$$(word 3,$$(s $(foreach test,$(call STEP_TEST_FILES,$(impl),$(step)),\ echo '----------------------------------------------'; \ echo 'Testing $@, step file: $+, test file: $(test)'; \ - echo 'Running: ../runtest.py $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+))'; \ - ../runtest.py $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+));))) + echo 'Running: ../runtest.py $(TEST_OPTS) $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+))'; \ + ../runtest.py $(TEST_OPTS) $(call $(impl)_TEST_OPTS) ../$(test) -- $(call $(impl)_RUNSTEP,$(step),$(+));))) test: $(ALL_TESTS) tests: $(ALL_TESTS) @@ -200,6 +228,16 @@ $(IMPL_STATS_LISP): echo "Stats (lisp only) for $(impl):"; \ $(MAKE) --no-print-directory -C $(impl) stats-lisp) +# Docker build rules + +docker-build: $(DOCKER_BUILD) + +.SECONDEXPANSION: +$(DOCKER_BUILD): + echo "----------------------------------------------"; \ + $(foreach impl,$(word 2,$(subst ^, ,$(@))),\ + echo "Running: docker build -t kanaka/mal-test-$(impl) .:"; \ + cd $(impl) && docker build -t kanaka/mal-test-$(impl) .) # Performance test rules