summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2005-07-26 16:12:56 +0000
committerdillo <dillo@pkgsrc.org>2005-07-26 16:12:56 +0000
commit58de13db8b41fc634fa5e8cf5a35dd8f341de2ad (patch)
treecfdc2e7d0132b6990535628a501634fdda0bc80b /regress
parent228b1f9528c40bef2ae41bb4a4a34a59219e73f7 (diff)
downloadpkgsrc-58de13db8b41fc634fa5e8cf5a35dd8f341de2ad.tar.gz
Test that PKG_FAIL_REASON is empty.
Diffstat (limited to 'regress')
-rw-r--r--regress/pkg-options/files/all.mk3
-rw-r--r--regress/pkg-options/files/all.out1
-rw-r--r--regress/pkg-options/files/groups.mk3
-rw-r--r--regress/pkg-options/files/groups.out1
-rw-r--r--regress/pkg-options/files/legacy-opt.mk3
-rw-r--r--regress/pkg-options/files/legacy-opt.out1
-rw-r--r--regress/pkg-options/files/order.mk3
-rw-r--r--regress/pkg-options/files/order.out1
-rw-r--r--regress/pkg-options/files/simple.mk3
-rw-r--r--regress/pkg-options/files/simple.out1
10 files changed, 15 insertions, 5 deletions
diff --git a/regress/pkg-options/files/all.mk b/regress/pkg-options/files/all.mk
index b344df2d835..228770ae946 100644
--- a/regress/pkg-options/files/all.mk
+++ b/regress/pkg-options/files/all.mk
@@ -1,4 +1,4 @@
-# $NetBSD: all.mk,v 1.3 2005/06/01 13:40:46 dillo Exp $
+# $NetBSD: all.mk,v 1.4 2005/07/26 16:12:56 dillo Exp $
#
# This file tests legacy variables and precedence of the various
# option variables.
@@ -23,4 +23,5 @@ NO_H=YES
.PHONY: test
test:
+ echo ${PKG_FAIL_REASON:M*:Q}
echo ${PKG_OPTIONS:M*:Q}
diff --git a/regress/pkg-options/files/all.out b/regress/pkg-options/files/all.out
index 0017feb1e5c..beeed512db1 100644
--- a/regress/pkg-options/files/all.out
+++ b/regress/pkg-options/files/all.out
@@ -1 +1,2 @@
+
a e f-1
diff --git a/regress/pkg-options/files/groups.mk b/regress/pkg-options/files/groups.mk
index 16b2a65c14d..081027038e0 100644
--- a/regress/pkg-options/files/groups.mk
+++ b/regress/pkg-options/files/groups.mk
@@ -1,4 +1,4 @@
-# $NetBSD: groups.mk,v 1.1 2005/06/02 20:38:51 dillo Exp $
+# $NetBSD: groups.mk,v 1.2 2005/07/26 16:12:56 dillo Exp $
#
# This file tests option groups (PKG_OPTIONS_REQUIRED_GROUPS and
# PKG_OPTIONS_OPTIONAL_GROUPS).
@@ -22,4 +22,5 @@ PKG_OPTIONS.foo+= g h i -i -h
.PHONY: test
test:
+ echo ${PKG_FAIL_REASON:M*:Q}
echo ${PKG_OPTIONS:M*:Q}
diff --git a/regress/pkg-options/files/groups.out b/regress/pkg-options/files/groups.out
index 75860503297..ea69b834549 100644
--- a/regress/pkg-options/files/groups.out
+++ b/regress/pkg-options/files/groups.out
@@ -1 +1,2 @@
+
b f g
diff --git a/regress/pkg-options/files/legacy-opt.mk b/regress/pkg-options/files/legacy-opt.mk
index 7bce7012339..bccaa9fd314 100644
--- a/regress/pkg-options/files/legacy-opt.mk
+++ b/regress/pkg-options/files/legacy-opt.mk
@@ -1,4 +1,4 @@
-# $NetBSD: legacy-opt.mk,v 1.3 2005/07/19 10:38:19 dillo Exp $
+# $NetBSD: legacy-opt.mk,v 1.4 2005/07/26 16:12:56 dillo Exp $
#
# This file tests PKG_OPTIONS_LEGACY_OPTS.
#
@@ -16,4 +16,5 @@ PKG_OPTIONS.foo= old
.PHONY: test
test:
+ echo ${PKG_FAIL_REASON:M*:Q}
echo ${PKG_OPTIONS:M*:Q}
diff --git a/regress/pkg-options/files/legacy-opt.out b/regress/pkg-options/files/legacy-opt.out
index 3e757656cf3..4ebfe2ca6ba 100644
--- a/regress/pkg-options/files/legacy-opt.out
+++ b/regress/pkg-options/files/legacy-opt.out
@@ -1 +1,2 @@
+
new
diff --git a/regress/pkg-options/files/order.mk b/regress/pkg-options/files/order.mk
index 49837a798f6..efa998b76e5 100644
--- a/regress/pkg-options/files/order.mk
+++ b/regress/pkg-options/files/order.mk
@@ -1,4 +1,4 @@
-# $NetBSD: order.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
+# $NetBSD: order.mk,v 1.3 2005/07/26 16:12:56 dillo Exp $
#
# This file tests the effect of the PKG_DEFAULT_OPTIONS variable.
#
@@ -14,4 +14,5 @@ PKG_DEFAULT_OPTIONS= -b b d inet6
.PHONY: test
test:
+ echo ${PKG_FAIL_REASON:M*:Q}
echo ${PKG_OPTIONS:Q}
diff --git a/regress/pkg-options/files/order.out b/regress/pkg-options/files/order.out
index 997a3d69564..70a2d426754 100644
--- a/regress/pkg-options/files/order.out
+++ b/regress/pkg-options/files/order.out
@@ -1 +1,2 @@
+
b c d e
diff --git a/regress/pkg-options/files/simple.mk b/regress/pkg-options/files/simple.mk
index 5e3ebeb782d..75f541753e4 100644
--- a/regress/pkg-options/files/simple.mk
+++ b/regress/pkg-options/files/simple.mk
@@ -1,4 +1,4 @@
-# $NetBSD: simple.mk,v 1.2 2005/05/31 13:33:39 dillo Exp $
+# $NetBSD: simple.mk,v 1.3 2005/07/26 16:12:56 dillo Exp $
#
# This file tests a very simple options configuration.
#
@@ -13,4 +13,5 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.unused
.PHONY: test
test:
+ echo ${PKG_FAIL_REASON:M*:Q}
echo ${PKG_OPTIONS:M*:Q}
diff --git a/regress/pkg-options/files/simple.out b/regress/pkg-options/files/simple.out
index fc66c988516..c42fe1e0945 100644
--- a/regress/pkg-options/files/simple.out
+++ b/regress/pkg-options/files/simple.out
@@ -1 +1,2 @@
+
b c e