Skip to content

Commit 31ba5a5

Browse files
committed
Copy stage2 to . and add test targets.
Can run "make test" in the NQP repo now on MoarVM, and most things pass. t/qregex hangs; we weren't attempting it in nqp-cc, though. No regressions compared to what make selftest passes.
1 parent fec7ea7 commit 31ba5a5

File tree

1 file changed

+37
-1
lines changed

1 file changed

+37
-1
lines changed

tools/build/Makefile-Moar.in

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ STAGE2_OUTPUT = $(STAGE2)/$(NQP_MO_MOAR) $(STAGE2)/$(MODULE_LOADER_MOAR) \
123123
$(STAGE2)/$(QAST_MOAR) $(STAGE2)/$(P6QREGEX_MOAR) \
124124
$(STAGE2)/$(NQP_MOAR)
125125

126-
all: $(STAGE2_OUTPUT)
126+
all: $(NQP_MOAR)
127127

128128
clean:
129129
$(PERL) -MExtUtils::Command -e rm_rf *.moarvm src/stage1 src/stage2 nqp nqp.bat
@@ -270,5 +270,41 @@ $(STAGE2)/$(NQP_MOAR): $(STAGE1) $(NQP_SOURCES) $(STAGE2)/$(P6QREGEX_MOAR)
270270
--setting=NQPCORE --target=mbc --no-regex-lib \
271271
--output=$(STAGE2)/$(NQP_MOAR) $(STAGE2)/$(NQP_COMBINED)
272272

273+
$(NQP_MOAR): $(STAGE2_OUTPUT)
274+
$(CP) $(STAGE2)/$(NQP_MO_MOAR) .
275+
$(CP) $(STAGE2)/$(MODULE_LOADER_MOAR) .
276+
$(CP) $(STAGE2)/$(CORE_SETTING_MOAR) .
277+
$(CP) $(STAGE2)/$(QASTNODE_MOAR) .
278+
$(CP) $(STAGE2)/$(QREGEX_MOAR) .
279+
$(CP) $(STAGE2)/$(HLL_MOAR) .
280+
$(CP) $(STAGE2)/$(MASTOPS_MOAR) .
281+
$(CP) $(STAGE2)/$(MASTNODES_MOAR) .
282+
$(CP) $(STAGE2)/$(QAST_MOAR) .
283+
$(CP) $(STAGE2)/$(P6QREGEX_MOAR) .
284+
$(CP) $(STAGE2)/$(NQP_MOAR) .
285+
286+
## testing
287+
288+
t/*/*.t: all
289+
prove -r -v --exec "$(MOAR) $(NQP_MOAR)" $@
290+
291+
test: all
292+
prove -r --exec "$(MOAR) $(NQP_MOAR)" t/nqp t/qregex t/p5regex t/qast t/serialization
293+
294+
test-loud: all
295+
prove -r -v --exec "$(MOAR) $(NQP_MOAR)" t/nqp t/qregex t/p5regex t/qast t/serialization
296+
297+
core-test: $(RUNNER)
298+
prove -r --exec "$(MOAR) $(NQP_MOAR)" t/nqp
299+
300+
core-test-loud: $(RUNNER)
301+
prove -r -v --exec "$(MOAR) $(NQP_MOAR)" t/nqp
302+
303+
qregex-test: $(RUNNER)
304+
prove -r --exec "$(MOAR) $(NQP_MOAR)" t/qregex
305+
306+
qregex-test-loud: $(RUNNER)
307+
prove -r -v --exec "$(MOAR) $(NQP_MOAR)" t/qregex
308+
273309
# nqp::makefile <-- tells NQP::Configure to treat this file as a makefile,
274310
# performing win32 slash and makefile conversions

0 commit comments

Comments
 (0)