pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/regress/buildlink-transform Allow this test to be used...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ec9c371ad15
branches:  trunk
changeset: 480026:3ec9c371ad15
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 28 08:20:44 2004 +0000

description:
Allow this test to be used with both the current buildlink3 framework
and the forthcoming wrapper script framework.

diffstat:

 regress/buildlink-transform/Makefile |  23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 5acda858a04c -r 3ec9c371ad15 regress/buildlink-transform/Makefile
--- a/regress/buildlink-transform/Makefile      Sat Aug 28 07:51:12 2004 +0000
+++ b/regress/buildlink-transform/Makefile      Sat Aug 28 08:20:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/08/28 06:26:41 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/28 08:20:44 jlam Exp $
 #
 # Run many buildlink transform tests in a single regression test to avoid
 # having to keep creating the wrapper scripts over and over again.
@@ -27,22 +27,33 @@
 BUILDLINK_TRANSFORM+=  l:readline:edit:termcap:m
 
 REGRESS_ENV=           PATH=${PATH}
-#REGRESS_ENV+=         WRAPPER_DEBUG=yes
+.if defined(PHASES_AFTER_WRAPPER)
+REGRESS_ENV+=          WRAPPER_DEBUG=yes
+.endif
 
 # Create a "regress" script in the wrapper directory that just echoes its
 # arguments.
 #
 REGRESS=               ${ECHO}
+.if defined(PHASES_AFTER_WRAPPER)
+_WRAPPEES+=            REGRESS
+_WRAP_ALIASES.REGRESS= regress
+WRAPPER_PHASE=         wrapper
+.else
 _BLNK_WRAPPEES+=       REGRESS
 _ALIASES.REGRESS=      regress
+WRAPPER_PHASE=         buildlink
+WRAPPER_BINDIR=                ${BUILDLINK_DIR}/bin
+.endif
 
-post-buildlink:
-       @${RM} ${BUILDLINK_DIR}/bin/${REGRESS}
+post-${WRAPPER_PHASE}:
+       @${RM} ${WRAPPER_BINDIR}/${REGRESS}
 
 .PHONY: regress do-regress
 
-regress: buildlink
-       @cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-regress PKG_PHASE=buildlink
+regress: ${WRAPPER_PHASE}
+       @cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-regress               \
+               PKG_PHASE=${WRAPPER_PHASE}
 
 do-regress:
        @${DO_NADA}



Home | Main Index | Thread Index | Old Index