cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust tests after recent changes, including separate tests for the case

Browse Source 
of correct devel/dconf dependency.
This commit is contained in:
zhuk 2014-05-08 15:44:42 +00:00
parent 2c410bd0a2
commit f7d060ab72
12 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/portcheck/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2014/05/07 22:28:05 zhuk Exp $
# $OpenBSD: Makefile,v 1.12 2014/05/08 15:44:42 zhuk Exp $
# To add a test named ${testname}:
# 1) If test should catch errors, add sample portcheck output to the
@ -11,7 +11,7 @@
# section below.
# user-customizeable
REGRESS_TARGETS ?= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11
REGRESS_TARGETS ?= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12
PORTCHECK ?= ${PORTSDIR}/infrastructure/bin/portcheck
PORTCHECK_ARGS ?=
SUBST_CMD ?= ${PORTSDIR}/infrastructure/bin/pkg_subst

7
tests/portcheck/t11.sample
View File

@ -1,8 +1,13 @@
in -exec: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -exec: extra @exec of glib-compile-schemas
in -nodep: missing RDEP on devel/glib2
in -main: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -noexec: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -noexec: missing @exec of glib-compile-schemas
in -nounexec: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -nounexec: missing @unexec-delete of glib-compile-schemas
in -unexec: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -unexec: extra @unexec-delete of glib-compile-schemas
in -wrong: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -wrong: incorrect glib-compile-schemas invocation: %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
in -wrong: incorrect glib-compile-schemas invocation: %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
in -wrong: missing @exec of glib-compile-schemas

16
tests/portcheck/t11/Makefile
View File

@ -1,23 +1,19 @@
# $OpenBSD: Makefile,v 1.1 2014/05/07 22:28:05 zhuk Exp $
# $OpenBSD: Makefile,v 1.2 2014/05/08 15:44:42 zhuk Exp $
#
# Check for @exec/@unexec-delete of glib-compile-schemas
# when dependency is wrong.
DISTNAME = test-11
COMMENT-main = test 11, correct handling
COMMENT-main = test 11, wrong dependency
COMMENT-exec = test 11, extra exec line
COMMENT-unexec = test 11, extra unexec-delete line
COMMENT-noexec = test 11, missing exec line
COMMENT-nounexec = test 11, missing unexec-delete line
COMMENT-nodep = test 11, missing dependency
COMMENT-wrong = test 11, wrong lines
MULTI_PACKAGES = -main -exec -unexec -noexec -nounexec -wrong -nodep
WANTLIB = glib-2.0
WANTLIB-nodep =
LIB_DEPENDS = devel/glib2
LIB_DEPENDS-nodep =
MULTI_PACKAGES = -main -exec -unexec -noexec -nounexec -wrong
LIB_DEPENDS-main = devel/glib2
WANTLIB-main = glib-2.0
.include <bsd.port.mk>

8
tests/portcheck/t12.sample Normal file
View File

@ -0,0 +1,8 @@
in -exec: extra @exec of glib-compile-schemas
in -noexec: missing @exec of glib-compile-schemas
in -nounexec: missing @unexec-delete of glib-compile-schemas
in -unexec: extra @unexec-delete of glib-compile-schemas
in -wrong: incorrect glib-compile-schemas invocation: %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
in -wrong: incorrect glib-compile-schemas invocation: %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
in -wrong: missing @exec of glib-compile-schemas
in -wrong: missing @unexec-delete of glib-compile-schemas

18
tests/portcheck/t12/Makefile Normal file
View File

@ -0,0 +1,18 @@
# $OpenBSD: Makefile,v 1.1 2014/05/08 15:44:42 zhuk Exp $
#
# Check for @exec/@unexec-delete of glib-compile-schemas
# when dependency is correct.
DISTNAME = test-12
COMMENT-main = test 12, correct handling
COMMENT-exec = test 12, extra exec line
COMMENT-unexec = test 12, extra unexec-delete line
COMMENT-noexec = test 12, missing exec line
COMMENT-nounexec = test 12, missing unexec-delete line
COMMENT-wrong = test 12, wrong lines
MULTI_PACKAGES = -main -exec -unexec -noexec -nounexec -wrong
MODULES = devel/dconf
.include <bsd.port.mk>

5
tests/portcheck/t12/pkg/PLIST-exec Normal file
View File

@ -0,0 +1,5 @@
@comment $OpenBSD: PLIST-exec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
share/glib-2.0/schemas/foo.xml
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

2
tests/portcheck/t11/pkg/PLIST-nodep → tests/portcheck/t12/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-nodep,v 1.1 2014/05/07 22:28:05 zhuk Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2014/05/08 15:44:43 zhuk Exp $
share/glib-2.0/schemas/foo.xml
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

3
tests/portcheck/t12/pkg/PLIST-noexec Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-noexec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
share/glib-2.0/schemas/foo.xml
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

3
tests/portcheck/t12/pkg/PLIST-nounexec Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-nounexec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
share/glib-2.0/schemas/foo.xml
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

5
tests/portcheck/t12/pkg/PLIST-unexec Normal file
View File

@ -0,0 +1,5 @@
@comment $OpenBSD: PLIST-unexec,v 1.1 2014/05/08 15:44:43 zhuk Exp $
share/glib-2.0/schemas/foo.xml
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null

4
tests/portcheck/t12/pkg/PLIST-wrong Normal file
View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PLIST-wrong,v 1.1 2014/05/08 15:44:43 zhuk Exp $
share/glib-2.0/schemas/foo.xml
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas

2
tests/portcheck/t5.sample
View File

@ -14,4 +14,4 @@ no distinfo in .
non-empty WANTLIB for arch-independent package
patches/patch-xyz does not have $OpenBSD$ RCS tag at the top
pkg/PLIST contains empty lines
translation file(s) found without devel/gettext dependency
translation file(s) found without devel/gettext dependency in MODULES or RUN_DEPENDS