pkgsrc-WIP-changes archive

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

mk-scm-tests: clean up code



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Sun Mar 4 22:07:10 2018 +0000
Changeset:	35a4005f6f69d4a9da19504acf0df4ebb49030a5

Modified Files:
	mk-scm-tests/Makefile

Log Message:
mk-scm-tests: clean up code

The outer package definition should be in the usual place. The fake
packages generated by the test suite are then defined further below,
as necessary.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=35a4005f6f69d4a9da19504acf0df4ebb49030a5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mk-scm-tests/Makefile | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diffs:
diff --git a/mk-scm-tests/Makefile b/mk-scm-tests/Makefile
index 4e97d9e203..b664a26243 100644
--- a/mk-scm-tests/Makefile
+++ b/mk-scm-tests/Makefile
@@ -1,19 +1,20 @@
 # $NetBSD$
 
-DISTNAME=	pkgbase-1.0
+.include "../../mk/bsd.prefs.mk"
+
+SCM_UNDER_TEST?=	# none; set by files/test
+.if empty(SCM_UNDER_TEST)
+
+DISTNAME=	mk-scm-tests-1.0
 CATEGORIES=	pkgtools
 PLIST_SRC=	# none
+DISTFILES=	# none
 
 MAINTAINER=	rillig%NetBSD.org@localhost
 HOMEPAGE=	https://www.pkgsrc.org/
 COMMENT=	System tests for wip/mk infrastructure
 LICENSE=	2-clause-bsd
 
-SCM_UNDER_TEST?=	# none; is set by files/test
-
-.if empty(SCM_UNDER_TEST)
-DISTNAME=	mk-scm-tests-1.0
-DISTFILES=	# none
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 USE_TOOLS+=	bash
@@ -23,9 +24,14 @@ run-tests: .PHONY
 
 do-install:
 	${DO_NADA}
-.endif
 
-.include "../../mk/bsd.prefs.mk"
+.else
+
+DISTNAME=	pkgbase-1.0
+CATEGORIES=	pkgtools
+PLIST_SRC=	# none
+
+.endif
 
 .if ${SCM_UNDER_TEST} == cvs
 CVS_ROOT=		${.CURDIR}/tmp/repo


Home | Main Index | Thread Index | Old Index