X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=61d2ca49d7223ac0389fd92b97be80ca8a174a0e;hb=756698e49da5b17014f51650e301ccc98df5154e;hp=ec99d02e5c47db93427b6a99a56b9241fdf469ed;hpb=3c321fdc92fa7fcff30f2f06cb61271e1d020eaa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index ec99d02..61d2ca4 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -41,7 +41,14 @@ true)
 		;;
 	aix*)
 		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
-		shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib"
+		case "$osvers" in
+		3*)
+			shrpldflags="$shrpldflags -e _nostart $ldflags $libs $cryptlib"
+			;;
+		*)
+			shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib"
+			;;
+		esac
 		aixinstdir=`pwd | sed 's/\/UU$//'`
 		linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl"
 		;;
@@ -489,8 +496,15 @@ depend: makedepend
 makedepend: makedepend.SH config.sh
 	sh ./makedepend.SH
 
-check test: miniperl perl preplibrary $(dynamic_ext)
-	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) && ./perl TEST </dev/tty
+test-prep: miniperl perl preplibrary $(dynamic_ext)
+	cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT))
+
+test check: test-prep
+	cd t && ./perl TEST </dev/tty
+
+# For testing without a tty or controling terminal. See t/op/stat.t
+test-notty: test-prep
+	cd t && PERL_SKIP_TTY_TEST=1 ./perl TEST
 
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.