Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Oct 2010 19:35:49 +0400
From:      Anonymous <swell.k@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/151539: [patch] devel/lua-alien: remove symlinks even if regression-test fails
Message-ID:  <8662wzwm22.fsf@gmail.com>
Resent-Message-ID: <201010181540.o9IFe9Xk014548@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         151539
>Category:       ports
>Synopsis:       [patch] devel/lua-alien: remove symlinks even if regression-test fails
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 18 15:40:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
Following files should not be installed

  DATADIR/tests/alien
  DATADIR/tests/alien.lua

http://pointyhat.freebsd.org/errorlogs/sparc64-errorlogs/e.7.20101015091133/lua51-alien-0.5.0.log

Also, split regression-test into more fine-grained chunks.
>How-To-Repeat:
$ make regression-test # force it to fail
$ make install deinstall
...
===>   Deinstalling lua51-alien-0.5.0
pkg_delete: unable to completely remove directory 'DATADIR/tests'
pkg_delete: unable to completely remove directory 'DATADIR'
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)
$ ls -1F DATADIR/tests/*
DATADIR/tests/alien@
DATADIR/tests/alien.lua@
>Fix:
--- a.diff begins here ---
Index: devel/lua-alien/Makefile
===================================================================
RCS file: /a/.cvsup/ports/devel/lua-alien/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/lua-alien/Makefile	22 Sep 2010 10:10:49 -0000	1.4
+++ devel/lua-alien/Makefile	18 Oct 2010 15:28:06 -0000
@@ -23,6 +23,7 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LUA_
 		-DBSD -fPIC #-fno-stack-protector
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR} -llua -shared
 MAKE_ENV+=	LIB_OPTION="${LDFLAGS}" LIB_EXT=".so" LUA="${LUA_CMD}"
+TESTS_EXCLUDE=	tests/alien tests/alien.lua
 
 # add lua prefix to directories
 .for p in data: docs:doc/ examples:examples/
@@ -51,7 +52,8 @@ do-install:
 .if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/constants ${DATADIR}
-	${TAR} cf - -C${WRKSRC} tests | ${TAR} xof - -C${DATADIR}
+	${TAR} cf - -C${WRKSRC} ${TESTS_EXCLUDE:S,^,--exclude ,} tests \
+		| ${TAR} xof - -C${DATADIR}
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -63,9 +65,8 @@ do-install:
 .endif
 
 regression-test:	build
-	cd ${WRKSRC}/tests; \
-	${LN} -s ../src/alien* .; \
-	${LUA_CMD} test_alien.lua; \
-	${RM} alien alien.lua
+	${LN} -fs ${TESTS_EXCLUDE:S,tests/,../src/,} ${WRKSRC}/tests
+	cd ${WRKSRC}/tests && ${LUA_CMD} test_alien.lua
+	${RM} -f ${TESTS_EXCLUDE:S,^,${WRKSRC}/,}
 
 .include <bsd.port.mk>
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8662wzwm22.fsf>