From owner-svn-ports-all@FreeBSD.ORG Thu Oct 10 17:09:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6B0EE163; Thu, 10 Oct 2013 17:09:34 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3EF832C20; Thu, 10 Oct 2013 17:09:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AH9Yav047945; Thu, 10 Oct 2013 17:09:34 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AH9XNa047943; Thu, 10 Oct 2013 17:09:33 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201310101709.r9AH9XNa047943@svn.freebsd.org> From: Antoine Brodin Date: Thu, 10 Oct 2013 17:09:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330020 - in head/Mk: . Scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 17:09:34 -0000 Author: antoine Date: Thu Oct 10 17:09:33 2013 New Revision: 330020 URL: http://svnweb.freebsd.org/changeset/ports/330020 Log: Add two QA tests for staged ports: - check for desktop files handling MIME types - check for share MIME-Info database Approved by: portmgr (bapt) Modified: head/Mk/Scripts/qa.sh head/Mk/bsd.stage.mk Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Thu Oct 10 16:56:42 2013 (r330019) +++ head/Mk/Scripts/qa.sh Thu Oct 10 17:09:33 2013 (r330020) @@ -71,7 +71,27 @@ stripped() { done } -checks="shebang symlinks paths stripped" +desktopfileutils() { + if [ -z "${USESDESKTOPFILEUTILS}" ]; then + grep -q MimeType= ${STAGEDIR}${PREFIX}/share/applications/*.desktop 2>/dev/null && + warn "you need USES=desktop-file-utils" + else + grep -q MimeType= ${STAGEDIR}${PREFIX}/share/applications/*.desktop 2>/dev/null || + warn "you may not need USES=desktop-file-utils" + fi +} + +sharedmimeinfo() { + if [ -z "${USESSHAREDMIMEINFO}" ]; then + find ${STAGEDIR}${PREFIX}/share/mime/packages/*.xml ! -name "freedesktop\.org\.xml" -quit 2>/dev/null && + warn "you need USES=shared-mime-info" + else + find ${STAGEDIR}${PREFIX}/share/mime/packages/*.xml ! -name "freedesktop\.org\.xml" -quit 2>/dev/null || + warn "you may not need USES=shared-mime-info" + fi +} + +checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo" ret=0 cd ${STAGEDIR} Modified: head/Mk/bsd.stage.mk ============================================================================== --- head/Mk/bsd.stage.mk Thu Oct 10 16:56:42 2013 (r330019) +++ head/Mk/bsd.stage.mk Thu Oct 10 17:09:33 2013 (r330020) @@ -7,7 +7,9 @@ DESTDIRNAME?= DESTDIR MAKE_ARGS+= ${DESTDIRNAME}=${STAGEDIR} QA_ENV+= STAGEDIR=${STAGEDIR} PREFIX=${PREFIX} \ - LOCALBASE=${LOCALBASE} + LOCALBASE=${LOCALBASE} \ + USESDESKTOPFILEUTILS=${USES:Mdesktop-file-utils} \ + USESSHAREDMIMEINFO=${USES:Mshared-mime-info} .if !target(stage-dir) stage-dir: