summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile.SH17
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.SH b/Makefile.SH
index c37250e834..4b3acfb968 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1514,18 +1514,23 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
-# Can't depend on lib/Config.pm because that might be where miniperl
+# minitest can't depend on lib/Config.pm because that might be where miniperl
# is crashing.
-minitest: $(MINIPERL_EXE)
+minitest_prep:
-@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
@echo " "
@echo "You may see some irrelevant test failures if you have been unable"
@echo "to build lib/Config.pm, or the Unicode data files."
@echo " "
- - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
- && $(RUN_PERL) TEST base/*.t comp/*.t cmd/*.t run/*.t \
- io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t \
- </dev/tty
+ - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE))
+
+MINITEST_TESTS = base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t perf/*.t
+
+minitest: $(MINIPERL_EXE) minitest_prep
+ - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) </dev/tty
+
+minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep
+ - cd t && PERL_SKIP_TTY_TEST=1 $(RUN_PERL) TEST $(MINITEST_TESTS)
# Test via harness