diff options
| -rw-r--r-- | regress/gnu/egcs/gcc/Makefile | 18 | ||||
| -rw-r--r-- | regress/gnu/egcs/libf2c/Makefile | 18 | ||||
| -rw-r--r-- | regress/gnu/egcs/libiberty/Makefile | 18 |
3 files changed, 21 insertions, 33 deletions
diff --git a/regress/gnu/egcs/gcc/Makefile b/regress/gnu/egcs/gcc/Makefile index 91c8e3edb58..0dd2a2bd569 100644 --- a/regress/gnu/egcs/gcc/Makefile +++ b/regress/gnu/egcs/gcc/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2004/12/29 06:02:14 david Exp $ +# $OpenBSD: Makefile,v 1.6 2006/02/11 23:54:34 david Exp $ .include <bsd.own.mk> NOMAN= NOPROG= -HAVE_DEJAGNU!=pkg_info dejagnu - .if ${USE_GCC3:L:Myes} TESTDIR=${BSDSRCDIR}/gnu/usr.bin/gcc .else @@ -19,17 +17,15 @@ REGRESS_TARGETS=do-gcc REGRESS_SKIP_TARGETS=do-gcc .endif -.if empty(HAVE_DEJAGNU) -do-gcc: - @echo "Error: DejaGnu is required to run this test."; - @echo " You can install the package from the ftp site or compile it"; - @echo " from the ports tree (${PORTSDIR}/devel/dejagnu)."; - @exit 1 -.else do-gcc: + @if [ ! "`pkg_info -e dejagnu-\*`" ]; then \ + echo "Error: DejaGnu is required to run this test."; \ + echo " You can install the package from the ftp site or compile it"; \ + echo " from the ports tree (${PORTSDIR}/devel/dejagnu)."; \ + exit 1; \ + fi @cd ${TESTDIR} && ${MAKE} -f Makefile.bsd-wrapper && \ ${MAKE} check RUNTEST=${RUNTEST}; -.endif .include <bsd.regress.mk> diff --git a/regress/gnu/egcs/libf2c/Makefile b/regress/gnu/egcs/libf2c/Makefile index 8824d52a6af..5a8797244c4 100644 --- a/regress/gnu/egcs/libf2c/Makefile +++ b/regress/gnu/egcs/libf2c/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2004/12/29 06:02:14 david Exp $ +# $OpenBSD: Makefile,v 1.6 2006/02/11 23:54:34 david Exp $ .include <bsd.own.mk> NOMAN= NOPROG= -HAVE_DEJAGNU!=pkg_info dejagnu - .if ${USE_GCC3:L:Myes} TESTDIR=${BSDSRCDIR}/gnu/lib/libf2c TEST2DIR=${BSDSRCDIR}/gnu/usr.bin/gcc @@ -25,18 +23,16 @@ REGRESS_TARGETS=do-libf2c REGRESS_SKIP_TARGETS=do-libf2c .endif -.if empty(HAVE_DEJAGNU) -do-libf2c: - @echo "Error: DejaGnu is required to run this test."; - @echo " You can install the package from the ftp site or compile it"; - @echo " from the ports tree (${PORTSDIR}/devel/dejagnu)."; - @exit 1 -.else do-libf2c: + @if [ ! "`pkg_info -e dejagnu-\*`" ]; then \ + echo "Error: DejaGnu is required to run this test."; \ + echo " You can install the package from the ftp site or compile it"; \ + echo " from the ports tree (${PORTSDIR}/devel/dejagnu)."; \ + exit 1; \ + fi @cd ${TESTDIR} && ${MAKE} -f Makefile.bsd-wrapper && \ cd ${TEST2DIR} && ${MAKE} -f Makefile.bsd-wrapper && \ cd ${TEST3DIR} && ${MAKE} G77DIR=${TEST4DIR} check RUNTEST=${RUNTEST}; -.endif .include <bsd.regress.mk> diff --git a/regress/gnu/egcs/libiberty/Makefile b/regress/gnu/egcs/libiberty/Makefile index 3b075d09922..2ab321bd474 100644 --- a/regress/gnu/egcs/libiberty/Makefile +++ b/regress/gnu/egcs/libiberty/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2004/12/29 06:02:14 david Exp $ +# $OpenBSD: Makefile,v 1.5 2006/02/11 23:54:34 david Exp $ NOMAN= NOPROG= -HAVE_DEJAGNU!=pkg_info dejagnu - TESTDIR=${BSDSRCDIR}/gnu/lib/libiberty REGRESS_TARGETS=do-libiberty @@ -13,17 +11,15 @@ REGRESS_TARGETS=do-libiberty REGRESS_SKIP_TARGETS=do-libiberty .endif -.if empty(HAVE_DEJAGNU) -do-libiberty: - @echo "Error: DejaGnu is required to run this test."; - @echo " You can install the package from the ftp site or compile it"; - @echo " from the ports tree (${PORTSDIR}/devel/dejagnu)."; - @exit 1 -.else do-libiberty: + @if [ ! "`pkg_info -e dejagnu-\*`" ]; then \ + echo "Error: DejaGnu is required to run this test."; \ + echo " You can install the package from the ftp site or compile it"; \ + echo " from the ports tree (${PORTSDIR}/devel/dejagnu)."; \ + exit 1; \ + fi @cd ${TESTDIR} && ${MAKE} -f Makefile.bsd-wrapper && \ ${MAKE} check RUNTEST=${RUNTEST}; -.endif .include <bsd.regress.mk> |