From 7d208c5503f8faac273f40cf9f00b6f83015dca8 Mon Sep 17 00:00:00 2001 From: zhuk Date: Thu, 8 May 2014 17:10:10 +0000 Subject: [PATCH] Adjust test output and add a test for RDEP-but-no-MODULES case for devel/dconf. --- tests/portcheck/t11.sample | 12 ++++++------ tests/portcheck/t12.sample | 1 + tests/portcheck/t12/Makefile | 6 ++++-- tests/portcheck/t12/pkg/PLIST-nodep | 4 ++++ 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 tests/portcheck/t12/pkg/PLIST-nodep diff --git a/tests/portcheck/t11.sample b/tests/portcheck/t11.sample index 02f9bbe3496..a1b3023e8ac 100644 --- a/tests/portcheck/t11.sample +++ b/tests/portcheck/t11.sample @@ -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 diff --git a/tests/portcheck/t12.sample b/tests/portcheck/t12.sample index b2cc3be7838..d9249ce004c 100644 --- a/tests/portcheck/t12.sample +++ b/tests/portcheck/t12.sample @@ -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 diff --git a/tests/portcheck/t12/Makefile b/tests/portcheck/t12/Makefile index d4622924751..8624499cfc6 100644 --- a/tests/portcheck/t12/Makefile +++ b/tests/portcheck/t12/Makefile @@ -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 diff --git a/tests/portcheck/t12/pkg/PLIST-nodep b/tests/portcheck/t12/pkg/PLIST-nodep new file mode 100644 index 00000000000..f27abddb40b --- /dev/null +++ b/tests/portcheck/t12/pkg/PLIST-nodep @@ -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