summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Broad <andy@broad.ology.org.uk>2015-08-24 22:06:14 -0400
committerJarkko Hietaniemi <jhi@iki.fi>2015-09-05 11:12:42 -0400
commit1247ba6ed4b8140f991b9be96a5aa0c54650bd3f (patch)
tree3f50ef45bceb39d8cad9bf1a8172945eb1be3c8e
parent959a079baa158504a2790eb709d73c123ed3644c (diff)
downloadperl-1247ba6ed4b8140f991b9be96a5aa0c54650bd3f.tar.gz
amigaos4: there is no /dev/tty but there is CONSOLE:
-rwxr-xr-xMakefile.SH14
1 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 4b3acfb968..c32b8913ac 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -20,6 +20,15 @@ case $PERL_CONFIG_SH in
;;
esac
+case "$osname" in
+amigaos)
+ devtty=CONSOLE:
+ ;;
+*)
+ devtty=/dev/tty
+ ;;
+esac
+
Makefile=Makefile
: This forces SH files to create target in same directory as SH file.
@@ -350,6 +359,9 @@ public = \$(PERL_EXE) utilities
shellflags = $shellflags
+# The /dev/tty or the moral equivalent.
+devtty = $devtty
+
# This is set to MAKE=$make if your $make command doesn't
# do it for you.
$make_set_make
@@ -1527,7 +1539,7 @@ minitest_prep:
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
+ - cd t && $(RUN_PERL) TEST $(MINITEST_TESTS) <$(devtty)
minitest-notty minitest_notty: $(MINIPERL_EXE) minitest_prep
- cd t && PERL_SKIP_TTY_TEST=1 $(RUN_PERL) TEST $(MINITEST_TESTS)