Adjust test output and add a test for RDEP-but-no-MODULES case for

devel/dconf.
This commit is contained in:
zhuk 2014-05-08 17:10:10 +00:00
parent 8a07bcfaf1
commit 7d208c5503
4 changed files with 15 additions and 8 deletions

View File

@ -1,13 +1,13 @@
in -exec: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -exec: GLib2 XML schemas found without devel/dconf in MODULES
in -exec: extra @exec of glib-compile-schemas
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 -main: GLib2 XML schemas found without devel/dconf in MODULES
in -noexec: GLib2 XML schemas found without devel/dconf in MODULES
in -noexec: missing @exec of glib-compile-schemas
in -nounexec: GLib2 XML schemas found without devel/dconf in MODULES or RUN_DEPENDS
in -nounexec: GLib2 XML schemas found without devel/dconf in MODULES
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: GLib2 XML schemas found without devel/dconf in MODULES
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: GLib2 XML schemas found without devel/dconf in MODULES
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

View File

@ -1,4 +1,5 @@
in -exec: extra @exec of glib-compile-schemas
in -nodep: missing RUN_DEPENDS-nodep+=${MODDCONF_RUN_DEPENDS}
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

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1 2014/05/08 15:44:42 zhuk Exp $
# $OpenBSD: Makefile,v 1.2 2014/05/08 17:10:10 zhuk Exp $
#
# Check for @exec/@unexec-delete of glib-compile-schemas
# when dependency is correct.
@ -11,8 +11,10 @@ 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
COMMENT-nodep = test 12, no run-time dependency
MULTI_PACKAGES = -main -exec -unexec -noexec -nounexec -wrong
MULTI_PACKAGES = -main -exec -unexec -noexec -nounexec -wrong -nodep
MODULES = devel/dconf
RUN_DEPENDS-nodep =
.include <bsd.port.mk>

View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PLIST-nodep,v 1.1 2014/05/08 17:10:10 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