Skip to content

Commit 4bcb5a1

Browse files
committed
build NQP launcher by default; use it in test runs
1 parent d9060a7 commit 4bcb5a1

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

tools/build/Makefile-Parrot.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ CLEANUPS = \
556556
src/vm/parrot/6model/reprs/*$(O) \
557557
src/vm/parrot/6model/reprs/*.pdb \
558558

559-
all: $(PARROT_BUILD_DIR)/$(NQP_EXE) $(P5QREGEX_PBC)
559+
all: $(PARROT_BUILD_DIR)/$(NQP_EXE) $(P5QREGEX_PBC) $(NQP_LAUNCHER)
560560

561561
install: all
562562
$(MKPATH) $(DESTDIR)$(PARROT_LIBRARY_DIR)
@@ -1111,22 +1111,22 @@ t/*/*.t: all
11111111
prove -r -v --exec $(PARROT_BUILD_DIR)/$(NQP_EXE) $@
11121112

11131113
test: all
1114-
prove -r --exec "$(PARROT_BUILD_DIR)/$(NQP_EXE) --vmlibs=nqp_dyncall_ops" t/nqp t/parrot t/hll t/qregex t/p5regex t/qast t/serialization t/nativecall
1114+
prove -r --exec "$(NQP_LAUNCHER) --vmlibs=nqp_dyncall_ops" t/nqp t/parrot t/hll t/qregex t/p5regex t/qast t/serialization t/nativecall
11151115

11161116
test-loud: all
1117-
prove -r -v --exec "$(PARROT_BUILD_DIR)/$(NQP_EXE) --vmlibs=nqp_dyncall_ops" t/nqp t/parrot t/hll t/qregex t/p5regex t/qast t/serialization t/nativecall
1117+
prove -r -v --exec "$(NQP_LAUNCHER) --vmlibs=nqp_dyncall_ops" t/nqp t/parrot t/hll t/qregex t/p5regex t/qast t/serialization t/nativecall
11181118

1119-
core-test: $(PARROT_BUILD_DIR)/$(NQP_EXE)
1119+
core-test: $(NQP_LAUNCHER)
11201120
prove -r --exec $(PARROT_BUILD_DIR)/$(NQP_EXE) t/nqp t/parrot
11211121

1122-
core-test-loud: $(PARROT_BUILD_DIR)/$(NQP_EXE)
1123-
prove -r -v --exec $(PARROT_BUILD_DIR)/$(NQP_EXE) t/nqp t/parrot
1122+
core-test-loud: $(NQP_LAUNCHER)
1123+
prove -r -v --exec $(NQP_LAUNCHER) t/nqp t/parrot
11241124

1125-
qregex-test: $(PARROT_BUILD_DIR)/$(NQP_EXE)
1126-
prove -r --exec $(PARROT_BUILD_DIR)/$(NQP_EXE) t/qregex
1125+
qregex-test: $(NQP_LAUNCHER)
1126+
prove -r --exec $(NQP_LAUNCHER) t/qregex
11271127

1128-
qregex-test-loud: $(PARROT_BUILD_DIR)/$(NQP_EXE)
1129-
prove -r -v --exec ./$(NQP_EXE) t/qregex
1128+
qregex-test-loud: $(NQP_LAUNCHER)
1129+
prove -r -v --exec $(NQP_LAUNCHER) t/qregex
11301130

11311131
## cleaning
11321132

0 commit comments

Comments
 (0)