diff options
| author |   jsg <jsg@openbsd.org> | 2017-08-26 09:07:52 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2017-08-26 09:07:52 +0000 |
| commit | 75d6c1061bbb811e8e5b2f08d3adaefb3bae51e2 (patch) | |
| tree | 49cea7de0166a208efa1b7d02b6ab3a5f9217c6f /regress/usr.bin/pkg-config | |
| parent | Don't remove subpaths of /usr/include or /usr/lib from the output of (diff) | |
| download | wireguard-openbsd-75d6c1061bbb811e8e5b2f08d3adaefb3bae51e2.tar.xz wireguard-openbsd-75d6c1061bbb811e8e5b2f08d3adaefb3bae51e2.zip | |
Add regression tests for not removing subpaths of /usr/include and
/usr/lib.
ok jasper@
Diffstat (limited to 'regress/usr.bin/pkg-config')
| -rw-r--r-- | regress/usr.bin/pkg-config/Makefile | 25 | ||||
| -rw-r--r-- | regress/usr.bin/pkg-config/pcdir/filter2.pc | 6 |
2 files changed, 29 insertions, 2 deletions
diff --git a/regress/usr.bin/pkg-config/Makefile b/regress/usr.bin/pkg-config/Makefile index 7716b85f11c..3fcac71aa90 100644 --- a/regress/usr.bin/pkg-config/Makefile +++ b/regress/usr.bin/pkg-config/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2017/08/15 01:22:05 jasper Exp $ +# $OpenBSD: Makefile,v 1.57 2017/08/26 09:07:52 jsg Exp $ REGRESS_TARGETS=cmp-vers1-1 \ cmp-vers1-2 \ @@ -88,7 +88,10 @@ REGRESS_TARGETS=cmp-vers1-1 \ variables-5 \ filter-system-dirs-1 \ filter-system-dirs-2 \ - filter-system-dirs-3 + filter-system-dirs-3 \ + filter-system-dirs-4 \ + filter-system-dirs-5 \ + filter-system-dirs-6 PKG_CONFIG?= /usr/bin/pkg-config PCONFIG = PKG_CONFIG_PATH=${.CURDIR}/pcdir/ ${PKG_CONFIG} @@ -609,6 +612,24 @@ filter-system-dirs-3: @${VPCONFIG} --static --libs filter @diff -u ${WANT} ${GOT} +filter-system-dirs-4: + # Test not removing -I/usr/include/filter as a system directory + @echo '-I/usr/include/filter -DFILTER' > ${WANT} + @${VPCONFIG} --cflags filter2 + @diff -u ${WANT} ${GOT} + +filter-system-dirs-5: + # Test not removing -L/usr/lib/filter as a system directory + @echo '-L/usr/lib/filter -lfilter' > ${WANT} + @${VPCONFIG} --libs filter2 + @diff -u ${WANT} ${GOT} + +filter-system-dirs-6: + # Test not removing -L/usr/lib/filter as a system directory (static) + @echo '-L/usr/lib/filter -lfilter -lprivate-filter' > ${WANT} + @${VPCONFIG} --static --libs filter2 + @diff -u ${WANT} ${GOT} + clean: rm -f *.want *.got diff --git a/regress/usr.bin/pkg-config/pcdir/filter2.pc b/regress/usr.bin/pkg-config/pcdir/filter2.pc new file mode 100644 index 00000000000..e4c90f22d4f --- /dev/null +++ b/regress/usr.bin/pkg-config/pcdir/filter2.pc @@ -0,0 +1,6 @@ +Name: Filter system dirs +Description: pkg-config(1) regress file +Version: 0.0 +Cflags: -I/usr/include/filter -DFILTER +Libs: -L/usr/lib/filter -lfilter +Libs.private: -L/usr/lib/filter -lprivate-filter |