pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/regress/pkg-options/files fix comments describing test...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cc4a46c3311
branches:  trunk
changeset: 494823:8cc4a46c3311
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Tue May 31 13:33:39 2005 +0000

description:
fix comments describing test cases

diffstat:

 regress/pkg-options/files/all.mk          |  5 +++--
 regress/pkg-options/files/legacy-opt.mk   |  4 ++--
 regress/pkg-options/files/order.mk        |  4 ++--
 regress/pkg-options/files/simple.mk       |  4 ++--
 regress/pkg-options/files/unsupported.mk  |  7 ++++---
 regress/pkg-options/files/unsupported.out |  2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diffs (77 lines):

diff -r 485f51779e96 -r 8cc4a46c3311 regress/pkg-options/files/all.mk
--- a/regress/pkg-options/files/all.mk  Tue May 31 12:31:59 2005 +0000
+++ b/regress/pkg-options/files/all.mk  Tue May 31 13:33:39 2005 +0000
@@ -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 -r 485f51779e96 -r 8cc4a46c3311 regress/pkg-options/files/legacy-opt.mk
--- a/regress/pkg-options/files/legacy-opt.mk   Tue May 31 12:31:59 2005 +0000
+++ b/regress/pkg-options/files/legacy-opt.mk   Tue May 31 13:33:39 2005 +0000
@@ -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 -r 485f51779e96 -r 8cc4a46c3311 regress/pkg-options/files/order.mk
--- a/regress/pkg-options/files/order.mk        Tue May 31 12:31:59 2005 +0000
+++ b/regress/pkg-options/files/order.mk        Tue May 31 13:33:39 2005 +0000
@@ -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 -r 485f51779e96 -r 8cc4a46c3311 regress/pkg-options/files/simple.mk
--- a/regress/pkg-options/files/simple.mk       Tue May 31 12:31:59 2005 +0000
+++ b/regress/pkg-options/files/simple.mk       Tue May 31 13:33:39 2005 +0000
@@ -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 -r 485f51779e96 -r 8cc4a46c3311 regress/pkg-options/files/unsupported.mk
--- a/regress/pkg-options/files/unsupported.mk  Tue May 31 12:31:59 2005 +0000
+++ b/regress/pkg-options/files/unsupported.mk  Tue May 31 13:33:39 2005 +0000
@@ -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_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 -r 485f51779e96 -r 8cc4a46c3311 regress/pkg-options/files/unsupported.out
--- a/regress/pkg-options/files/unsupported.out Tue May 31 12:31:59 2005 +0000
+++ b/regress/pkg-options/files/unsupported.out Tue May 31 13:33:39 2005 +0000
@@ -1,1 +1,1 @@
-The following selected options are not supported: b
+The following selected options are not supported: b c



Home | Main Index | Thread Index | Old Index