summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2005-05-31 13:33:39 +0000
committerdillo <dillo@pkgsrc.org>2005-05-31 13:33:39 +0000
commitd5a1ec9ba1e736ae3484f7bd0ebecd238d1c5641 (patch)
tree861b69662c9b1efe76242d42fbdaac23743e2ffd /regress
parentcd1f046b566f220ddacde8da4ddeaf1c47742763 (diff)
downloadpkgsrc-d5a1ec9ba1e736ae3484f7bd0ebecd238d1c5641.tar.gz
fix comments describing test cases
Diffstat (limited to 'regress')
-rw-r--r--regress/pkg-options/files/all.mk5
-rw-r--r--regress/pkg-options/files/legacy-opt.mk4
-rw-r--r--regress/pkg-options/files/order.mk4
-rw-r--r--regress/pkg-options/files/simple.mk4
-rw-r--r--regress/pkg-options/files/unsupported.mk7
-rw-r--r--regress/pkg-options/files/unsupported.out2
6 files changed, 14 insertions, 12 deletions
diff --git a/regress/pkg-options/files/all.mk b/regress/pkg-options/files/all.mk
index 3b34b5dceac..952ffbdc818 100644
--- a/regress/pkg-options/files/all.mk
+++ b/regress/pkg-options/files/all.mk
@@ -1,6 +1,7 @@
-# $NetBSD: all.mk,v 1.1 2005/05/28 12:16:43 dillo Exp $
+# $NetBSD: all.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
#
-# This file test a very simple options configuration.
+# This file tests legacy variables and precedence of the various
+# option variables.
#
MAKECONF= /dev/null
diff --git a/regress/pkg-options/files/legacy-opt.mk b/regress/pkg-options/files/legacy-opt.mk
index 47c8c9218b7..2faf30d7ef7 100644
--- a/regress/pkg-options/files/legacy-opt.mk
+++ b/regress/pkg-options/files/legacy-opt.mk
@@ -1,6 +1,6 @@
-# $NetBSD: legacy-opt.mk,v 1.1 2005/05/31 11:05:31 dillo Exp $
+# $NetBSD: legacy-opt.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
#
-# This file test a very simple options configuration.
+# This file tests PKG_OPTIONS_LEGACY_OPTS.
#
MAKECONF= /dev/null
diff --git a/regress/pkg-options/files/order.mk b/regress/pkg-options/files/order.mk
index 0a822cc727c..49837a798f6 100644
--- a/regress/pkg-options/files/order.mk
+++ b/regress/pkg-options/files/order.mk
@@ -1,6 +1,6 @@
-# $NetBSD: order.mk,v 1.1.1.1 2005/05/16 00:09:03 rillig Exp $
+# $NetBSD: order.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
#
-# This file test the effect of the PKG_DEFAULT_OPTIONS variable.
+# This file tests the effect of the PKG_DEFAULT_OPTIONS variable.
#
MAKECONF= /dev/null
diff --git a/regress/pkg-options/files/simple.mk b/regress/pkg-options/files/simple.mk
index 418620724c4..5e3ebeb782d 100644
--- a/regress/pkg-options/files/simple.mk
+++ b/regress/pkg-options/files/simple.mk
@@ -1,6 +1,6 @@
-# $NetBSD: simple.mk,v 1.1.1.1 2005/05/16 00:09:03 rillig Exp $
+# $NetBSD: simple.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
#
-# This file test a very simple options configuration.
+# This file tests a very simple options configuration.
#
MAKECONF= /dev/null
diff --git a/regress/pkg-options/files/unsupported.mk b/regress/pkg-options/files/unsupported.mk
index 14a307e8f76..041b871ddcc 100644
--- a/regress/pkg-options/files/unsupported.mk
+++ b/regress/pkg-options/files/unsupported.mk
@@ -1,6 +1,7 @@
-# $NetBSD: unsupported.mk,v 1.1 2005/05/28 12:16:43 dillo Exp $
+# $NetBSD: unsupported.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
#
-# This file test the effect of the PKG_DEFAULT_OPTIONS variable.
+# This file tests that selecting unsupported options in PKG_OPTIONS.foo
+# causes the package build to fail.
#
MAKECONF= /dev/null
@@ -9,7 +10,7 @@ PKG_SUPPORTED_OPTIONS= a
PKG_SUGGESTED_OPTIONS=
PKG_OPTIONS_VAR= PKG_OPTIONS.foo
PKG_DEFAULT_OPTIONS=
-PKG_OPTIONS.foo= b
+PKG_OPTIONS.foo= b c
.include "../../mk/bsd.options.mk"
diff --git a/regress/pkg-options/files/unsupported.out b/regress/pkg-options/files/unsupported.out
index 7892fcb5214..8c14bef01ea 100644
--- a/regress/pkg-options/files/unsupported.out
+++ b/regress/pkg-options/files/unsupported.out
@@ -1 +1 @@
-The following selected options are not supported: b
+The following selected options are not supported: b c