diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2018-05-17 19:02:06 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2018-05-17 19:02:06 +0000 |
| commit | bd9dd52217153e597a0bd6930d1cae3520d07046 (patch) | |
| tree | eae11a3871177d7eb9c521ac2609fae7c6dd44e5 | |
| parent | 947dac44178ffcd69576125b2f7bfa73f1048430 (diff) | |
add some more whitespace torture partly induced by aja@
5 files changed, 33 insertions, 3 deletions
diff --git a/regress/usr.bin/pkg-config/Makefile b/regress/usr.bin/pkg-config/Makefile index 3fcac71aa90..7ae5a946aaf 100644 --- a/regress/usr.bin/pkg-config/Makefile +++ b/regress/usr.bin/pkg-config/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2017/08/26 09:07:52 jsg Exp $ +# $OpenBSD: Makefile,v 1.58 2018/05/17 19:02:05 jasper Exp $ REGRESS_TARGETS=cmp-vers1-1 \ cmp-vers1-2 \ @@ -62,9 +62,13 @@ REGRESS_TARGETS=cmp-vers1-1 \ whitespace-cflags \ whitespace-libs \ whitespace-linebreak \ + whitespace-requires-1 \ + whitespace-requires-2 \ whitespace-name \ whitespace-property-1 \ whitespace-property-2 \ + whitespace-property-3 \ + whitespace-property-4 \ quoting \ broken-require-1 \ broken-require-2 \ @@ -468,6 +472,14 @@ whitespace-linebreak: @${VPCONFIG} --libs linebreak @diff -u ${WANT} ${GOT} +whitespace-requires-1: + # Test whitespace in version comparison + @${VPCONFIG} --exists $@ + +whitespace-requires-2: + # Test whitespace in version comparison + @${VPCONFIG} --exists $@ + whitespace-name: # Test whitespace in Name @echo "Requested 'whitespace > 0.2.0' but version of Whitespace test is 0.0.0" > ${WANT} @@ -481,7 +493,13 @@ whitespace-property-1: @diff -u ${WANT} ${GOT} whitespace-property-2: - # Test whitespace after property name + # Test whitespace after property value + @echo "0.0.0" > ${WANT} + @${VPCONFIG} --modversion whitespace-prop-2 + @diff -u ${WANT} ${GOT} + +whitespace-property-3: + # Test whitespace before property value @echo "0.0.0" > ${WANT} @${VPCONFIG} --modversion whitespace-prop-3 @diff -u ${WANT} ${GOT} diff --git a/regress/usr.bin/pkg-config/pcdir/whitespace-prop-2.pc b/regress/usr.bin/pkg-config/pcdir/whitespace-prop-2.pc index 9baddc69577..6bb3b90d0f6 100644 --- a/regress/usr.bin/pkg-config/pcdir/whitespace-prop-2.pc +++ b/regress/usr.bin/pkg-config/pcdir/whitespace-prop-2.pc @@ -3,5 +3,5 @@ includedir=${prefix}/include Name: Whitespace test Description: pkg-config(1) regress file -Version: 0.0.0 +Version: 0.0.0 # intentional whitespace after value Cflags: -I${includedir} diff --git a/regress/usr.bin/pkg-config/pcdir/whitespace-requires-1.pc b/regress/usr.bin/pkg-config/pcdir/whitespace-requires-1.pc new file mode 100644 index 00000000000..534889186ee --- /dev/null +++ b/regress/usr.bin/pkg-config/pcdir/whitespace-requires-1.pc @@ -0,0 +1,4 @@ +Name: Whitespace test +Description: pkg-config(1) regress file +Version: 1.0 +Requires: whitespace-prop-2 >= 0 whitespace-prop-2 >= 0 diff --git a/regress/usr.bin/pkg-config/pcdir/whitespace-requires-2.pc b/regress/usr.bin/pkg-config/pcdir/whitespace-requires-2.pc new file mode 100644 index 00000000000..5f2c00d82c3 --- /dev/null +++ b/regress/usr.bin/pkg-config/pcdir/whitespace-requires-2.pc @@ -0,0 +1,4 @@ +Name: Whitespace test +Description: pkg-config(1) regress file +Version: 1.0 +Requires: whitespace-prop-2 >= 0 whitespace-prop-2 >= 0 diff --git a/regress/usr.bin/pkg-config/pcdir/whitespace-requires-3.pc b/regress/usr.bin/pkg-config/pcdir/whitespace-requires-3.pc new file mode 100644 index 00000000000..afdae78cb8d --- /dev/null +++ b/regress/usr.bin/pkg-config/pcdir/whitespace-requires-3.pc @@ -0,0 +1,4 @@ +Name: Whitespace test +Description: pkg-config(1) regress file +Version: 1.0 +Requires: whitespace-prop-2 >= 0 |