summaryrefslogtreecommitdiff
path: root/regress/usr.bin/pkg-config
diff options
context:
space:
mode:
authorJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-09-20 14:08:18 +0000
committerJasper Lievisse Adriaanse <jasper@cvs.openbsd.org>2011-09-20 14:08:18 +0000
commit72eafef24fde24e155edd658ae6e9193cad7126b (patch)
tree2ae4382016fc7a18f3b3260a79ceee484260ea61 /regress/usr.bin/pkg-config
parent6bcd8b084ad4b35f7b7874bec2751b0b8adae96f (diff)
- stop pretending to care about variable expansion to multiple values
in a field. the only reason this is "allowed" by fd.o pkg-config is because their parser is sloppy.
Diffstat (limited to 'regress/usr.bin/pkg-config')
-rw-r--r--regress/usr.bin/pkg-config/Makefile18
1 files changed, 1 insertions, 17 deletions
diff --git a/regress/usr.bin/pkg-config/Makefile b/regress/usr.bin/pkg-config/Makefile
index af02a15f604..70ed3c354ba 100644
--- a/regress/usr.bin/pkg-config/Makefile
+++ b/regress/usr.bin/pkg-config/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2011/09/17 18:07:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2011/09/20 14:08:17 jasper Exp $
REGRESS_TARGETS=cmp-vers1-1 \
cmp-vers1-2 \
@@ -42,9 +42,7 @@ REGRESS_TARGETS=cmp-vers1-1 \
static-libs3 \
static-libs4 \
variable-get-1 \
- variable-get-2 \
variable-set \
- variable-requires \
missing-req-1 \
missing-req-2 \
missing-req-3 \
@@ -366,13 +364,6 @@ variable-get-1:
--print-errors --variable prefix sysroot > ${GOT}
@diff -u ${WANT} ${GOT}
-variable-get-2:
- # Test --variable (expansion to multiple values)
- @echo "alpha beta" > ${WANT}
- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \
- --print-errors --variable requires requires-test3 > ${GOT}
- @diff -u ${WANT} ${GOT}
-
variable-set:
# Test --define-variable
@echo "-I/usr/local2/include -I/usr/local2/include/foo" > ${WANT}
@@ -381,13 +372,6 @@ variable-set:
--cflags sysroot > ${GOT}
@diff -u ${WANT} ${GOT}
-variable-requires:
- # Test variable expansion in non-variable fields, to multiple values
- @echo " -lalpha2" > ${WANT}
- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \
- --print-errors --libs requires-test3 > ${GOT}
- @diff -u ${WANT} ${GOT}
-
# This fails as we read and check Requires as well as Requires.private where
# only Requires needs to be checked here as we ask for Libs and not Cflags.
missing-req-1: