src - OpenBSD base system

diff options


context:
space:
mode:

author	Marc Espie <espie@cvs.openbsd.org>	2012-07-08 06:24:14 +0000
committer	Marc Espie <espie@cvs.openbsd.org>	2012-07-08 06:24:14 +0000
commit	8e5fb732473db24fd154781d94fd75fb5c3b25a0 (patch)
tree	8304dff35a5f29ccd1679bb5009d088389d26211 /regress
parent	fa7b9c4591689193fd6477a650de2d44c0184be7 (diff)

simplify, make sure everything uses ${PKG_CONFIG}

Diffstat (limited to 'regress')

-rw-r--r--

regress/usr.bin/pkg-config/Makefile

116

1 files changed, 58 insertions, 58 deletions

diff --git a/regress/usr.bin/pkg-config/Makefile b/regress/usr.bin/pkg-config/Makefile
index e997e088b92..2ffc54b610b 100644
--- a/regress/usr.bin/pkg-config/Makefile
+++ b/regress/usr.bin/pkg-config/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.29 2012/07/03 21:48:04 jasper Exp $

+# $OpenBSD: Makefile,v 1.30 2012/07/08 06:24:13 espie Exp $

REGRESS_TARGETS=cmp-vers1-1 \

cmp-vers1-2 \

@@ -53,6 +53,7 @@ REGRESS_TARGETS=cmp-vers1-1 \

whitespace-name

PKG_CONFIG= pkg-config

+PCONFIG = PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG}

#PKG_CONFIG= /usr/obj/ports/pkgconfig-0.26/fake-i386/usr/local/bin/pkg-config

WANT= ${.OBJDIR}/$@.want

GOT= ${.OBJDIR}/$@.got

@@ -61,14 +62,14 @@ GOT= ${.OBJDIR}/$@.got

corrupt1:

# Test for missing variables/fields

@echo "Package '$@' has no Version: field" > ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @if ${PCONFIG} \

--errors-to-stdout --print-errors --exists $@ > ${GOT}; then false; fi

@diff -u ${WANT} ${GOT}

corrupt2:

# Test for missing variables/fields

@echo "Package '$@' has no Name: field" > ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @if ${PCONFIG} \

--errors-to-stdout --print-errors --exists $@ > ${GOT}; then false; fi

@diff -u ${WANT} ${GOT}

@@ -76,7 +77,7 @@ corrupt3:

# Test for empty file

@echo "Package file '$@.pc' appears to be empty" > ${WANT}

@echo "Package '$@' has no Name: field" >> ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @if ${PCONFIG} \

--errors-to-stdout --print-errors --libs $@ > ${GOT}; then false; fi

@diff -u ${WANT} ${GOT}

@@ -84,119 +85,119 @@ corrupt3:

print-provides:

# Test --print-provides

@echo "print-provides = 0.0.0" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--print-provides $@ > ${GOT}

@diff -u ${WANT} ${GOT}

print-req:

# Test --print-requires

@echo "print-req2>=0.0.1" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--print-requires $@ > ${GOT}

@diff -u ${WANT} ${GOT}

print-req-priv:

# Test --print-requires-private

@echo "print-req-priv2>=0.0.0" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--print-requires-private $@ > ${GOT}

@diff -u ${WANT} ${GOT}

# Tests for version comparison

cmp-vers1-1:

# Test regular versions (a <= b)

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists \

+ @if ${PCONFIG} --exists \

"vers1 <= 0.0.2"; then false; fi

cmp-vers1-2:

# Test regular versions (a <= b)

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists "vers1 <= 0.1.0"

+ @${PCONFIG} --exists "vers1 <= 0.1.0"

cmp-vers1-3:

# Test regular versions (a < b)

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists "vers1 < 0.2"

+ @${PCONFIG} --exists "vers1 < 0.2"

cmp-vers2-1:

# Test regular versions (a >= b)

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists "vers2 >= 0.0.1"

+ @${PCONFIG} --exists "vers2 >= 0.0.1"

cmp-vers2-2:

# Test regular versions (a >= b)

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists "vers2 >= 0.0.0"

+ @${PCONFIG} --exists "vers2 >= 0.0.0"

cmp-vers2-3:

# Test regular versions (a >= b)

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists "vers2 >= 0.1.0"

+ @${PCONFIG} --exists "vers2 >= 0.1.0"

cmp-vers2-4:

# Test regular versions (a >= b)

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists \

+ @if ${PCONFIG} --exists \

"vers2 > 0.2.0.0"; then false; fi

cmp-vers3:

# Test regular versions (a = b)

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --exists "vers2 = 0.2.0"

+ @${PCONFIG} --exists "vers2 = 0.2.0"

cmp-vers4-1:

# Test suffixed versions (alpha >)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha > 0.1.0" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-2:

# Test suffixed versions (alpha >)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha > 0.1.0alpha1" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-3:

# Test suffixed versions (alpha >=)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha >= 0.1.0" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-4:

# Test suffixed versions (alpha >=)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha >= 0.1.0alpha2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-5:

# Test suffixed versions (alpha <)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha < 0.1.1" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-6:

# Test suffixed versions (alpha <)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha < 0.1.0alpha3" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-7:

# Test suffixed versions (alpha <=)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha < 0.1.1" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-8:

# Test suffixed versions (alpha <=)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha <= 0.1.0alpha2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers4-9:

# Test suffixed versions (alpha =)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha = 0.1.0alpha2" > ${GOT}

@diff -u ${WANT} ${GOT}

@@ -204,49 +205,49 @@ cmp-vers4-9:

cmp-vers5-1:

# Test suffixed versions (beta > alpha)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "beta > 0.1.0alpha1" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-2:

# Test suffixed versions (beta >= alpha)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "beta >= 0.1.0beta1" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-3:

# Test suffixed versions (alpha < rc)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha < 0.1.0rc2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-4:

# Test suffixed versions (beta < rc)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "beta < 0.1.0rc2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-5:

# Test suffixed versions (alpha < beta)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "alpha < 0.1.0beta2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-6:

# Test suffixed versions (rc > alpha)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "rc > 0.1.0alpha2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-7:

# Test suffixed versions (rc > beta)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "rc > 0.1.0beta2" > ${GOT}

@diff -u ${WANT} ${GOT}

@@ -255,35 +256,35 @@ cmp-vers5-7:

cmp-vers5-8:

# Test suffixed versions (' ' > alpha)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "vers1 > 0.1.0alpha2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-9:

# Test suffixed versions (' ' > beta)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "beta <= 0.1.0beta2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers5-10:

# Test suffixed versions (' ' > rc)

@touch ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} \

+ @${PCONFIG} \

--errors-to-stdout --print-errors "beta <= 0.1.0rc2" > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers6-1:

# Test suffixed versions in Requires

@echo " -lalpha2" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \

+ @${PCONFIG} --errors-to-stdout \

--print-errors --libs requires-test2 > ${GOT}

@diff -u ${WANT} ${GOT}

cmp-vers6-2:

# Test suffixed versions in Requires.private

@echo "Requested 'alpha >= 0.1.0alpha3' but version of alpha suffix test is 0.1.0alpha2" > ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \

+ @if ${PCONFIG} --errors-to-stdout \

--print-errors --libs --static requires-test2 > ${GOT}; then \

false; fi

@diff -u ${WANT} ${GOT}

@@ -296,71 +297,70 @@ logfile:

# Test PKG_CONFIG_LOG

@echo "[/usr/bin/pkg-config] [--exists] [sysroot >= 0.0.0]" > ${WANT}

@rm -f ${GOT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_LOG=${GOT} \

- ${PKG_CONFIG} --exists "sysroot >= 0.0.0"

+ @PKG_CONFIG_LOG=${GOT} ${PCONFIG} --exists "sysroot >= 0.0.0"

@diff -u ${WANT} ${GOT}

sysroot-cflags:

# Test PKG_CONFIG_SYSROOT_DIR (cflags)

@echo "-I/altroot/tmp/include -I/altroot/tmp/include/foo" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_SYSROOT_DIR=/altroot \

- ${PKG_CONFIG} --cflags sysroot > ${GOT}

+ @PKG_CONFIG_SYSROOT_DIR=/altroot ${PCONFIG} \

+ --cflags sysroot > ${GOT}

@diff -u ${WANT} ${GOT}

sysroot-libs:

# Test PKG_CONFIG_SYSROOT_DIR (libs)

@echo "-L/altroot/tmp/lib -L/altroot/tmp/lib/foo -lc" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_SYSROOT_DIR=/altroot \

- ${PKG_CONFIG} --libs sysroot > ${GOT}

+ @PKG_CONFIG_SYSROOT_DIR=/altroot ${PCONFIG} \

+ --libs sysroot > ${GOT}

@diff -u ${WANT} ${GOT}

# Tests for static linking

static-cflags1:

# Test grabbing Cflags (without Requires.private)

@echo "-I/usr/local/include/foo" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --cflags --static static > ${GOT}

@diff -u ${WANT} ${GOT}

static-cflags2:

# Test grabbing Cflags (with Requires.private)

@echo "-I/usr/local/include/foo -I/usr/local/include" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --cflags --static static2 > ${GOT}

@diff -u ${WANT} ${GOT}

static-libs1:

# Test grabbing Libs.private from this package

@echo "-L/usr/local/lib -lc -lm -ll" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --libs --static static > ${GOT}

@diff -u ${WANT} ${GOT}

static-libs2:

# Test grabbing Libs.private from Requires in order

@echo "-L/usr/local/lib -lc -lm -ll -lutil -lz" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --libs --static static2 > ${GOT}

@diff -u ${WANT} ${GOT}

static-libs3:

# Test grabbing Libs.private from Requires.private in order

@echo "-L/tmp/lib -L/tmp/lib/foo -L/usr/local/lib -lbaz\ quux -lc -lm -ll -lutil -lz" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --libs --static static3 > ${GOT}

@diff -u ${WANT} ${GOT}

static-libs4:

# Test Requires.private

@echo "-L/public-dep/lib -L/private-dep/lib -L/requires-test/lib -lpublic-dep -lprivate-dep -lrequires-test" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --libs --static requires-test > ${GOT}

@diff -u ${WANT} ${GOT}

static-order:

# Test Requires.private order

@echo "-L/usr/X11R6/lib -lstatic-order1 -lstatic-order2 -lstatic-order3" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --print-errors \

+ @${PCONFIG} --print-errors \

--errors-to-stdout --static --libs static-order1 > ${GOT}

@diff -u ${WANT} ${GOT}

@@ -368,14 +368,14 @@ static-order:

variable-get-1:

# Test --variable

@echo "/tmp" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \

+ @${PCONFIG} --errors-to-stdout \

--print-errors --variable prefix sysroot > ${GOT}

@diff -u ${WANT} ${GOT}

variable-set:

# Test --define-variable

@echo "-I/usr/local2/include -I/usr/local2/include/foo" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \

+ @${PCONFIG} --errors-to-stdout \

--print-errors --define-variable=prefix=/usr/local2 \

--cflags sysroot > ${GOT}

@diff -u ${WANT} ${GOT}

@@ -385,49 +385,49 @@ variable-set:

missing-req-1:

# Test for missing packages in Requires (libs)

@echo "Package nonexisting was not found in the pkg-config search path" > ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config --libs \

+ @if ${PCONFIG} --libs \

--errors-to-stdout --print-errors missing-req > ${GOT}; then false; fi

@diff -u ${WANT} ${GOT}

missing-req-2:

# Test for missing packages in Requires (cflags)

@echo "Package nonexisting was not found in the pkg-config search path" > ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config --cflags \

+ @if ${PCONFIG} --cflags \

--errors-to-stdout --print-errors missing-req > ${GOT}; then false; fi

@diff -u ${WANT} ${GOT}

missing-req-3:

# Test for missing packages in Requires (version)

@echo "0.0.0" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --modversion \

+ @${PCONFIG} --modversion \

--errors-to-stdout --print-errors missing-req > ${GOT}

@diff -u ${WANT} ${GOT}

whitespace-cflags:

# Test whitespace on various positions in Cflags

@echo "-I/tmp/include -I/tmp/include/include\ dir" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --cflags \

+ @${PCONFIG} --cflags \

--errors-to-stdout --print-errors whitespace > ${GOT}

@diff -u ${WANT} ${GOT}

whitespace-libs:

# Test whitespace on various positions in Libs

@echo "-L/tmp/lib -L/tmp/lib/foo -lbaz\ quux" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --libs \

+ @${PCONFIG} --libs \

--errors-to-stdout --print-errors whitespace > ${GOT}

@diff -u ${WANT} ${GOT}

whitespace-linebreak:

# Test linebreak in Description field

@echo " -lc" > ${WANT}

- @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \

+ @${PCONFIG} --errors-to-stdout \

--print-errors --libs linebreak > ${GOT}

@diff -u ${WANT} ${GOT}

whitespace-name:

# Test whitespace in Name

@echo "Requested 'whitespace > 0.2.0' but version of Whitespace test is 0.0.0" > ${WANT}

- @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} --errors-to-stdout \

+ @if ${PCONFIG} --errors-to-stdout \

--print-errors "whitespace > 0.2.0" > ${GOT}; then false; fi

@diff -u ${WANT} ${GOT}