tests: fixup trailing whitespace in expected results
ci/woodpecker/push/woodpecker Pipeline was successful Details

pull/249/head
Ariadne Conill 2023-01-21 20:22:03 +00:00
parent b106de0c7a
commit 8f12d36b76
8 changed files with 82 additions and 82 deletions

View File

@ -50,7 +50,7 @@ libs_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lfoo \n" \ -o inline:"-L/test/lib -lfoo\n" \
pkgconf --libs foo pkgconf --libs foo
} }
@ -58,7 +58,7 @@ libs_cflags_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
pkgconf --cflags --libs foo pkgconf --cflags --libs foo
} }
@ -67,7 +67,7 @@ libs_cflags_version_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
pkgconf --cflags --libs 'foo > 1.2' pkgconf --cflags --libs 'foo > 1.2'
} }
@ -75,7 +75,7 @@ libs_cflags_version_multiple_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo\n" \
pkgconf --cflags --libs 'foo > 1.2 bar >= 1.3' pkgconf --cflags --libs 'foo > 1.2 bar >= 1.3'
} }
@ -83,7 +83,7 @@ libs_cflags_version_multiple_coma_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo\n" \
pkgconf --cflags --libs 'foo > 1.2,bar >= 1.3' pkgconf --cflags --libs 'foo > 1.2,bar >= 1.3'
} }
@ -91,7 +91,7 @@ libs_cflags_version_alt_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
pkgconf --cflags --libs 'foo' '>' '1.2' pkgconf --cflags --libs 'foo' '>' '1.2'
} }
@ -99,7 +99,7 @@ libs_cflags_version_different_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lfoo\n" \
pkgconf --cflags --libs 'foo' '!=' '1.3.0' pkgconf --cflags --libs 'foo' '!=' '1.3.0'
} }
@ -207,7 +207,7 @@ libs_intermediary_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-lintermediary-1 -lintermediary-2 -lfoo -lbar -lbaz \n" \ -o inline:"-lintermediary-1 -lintermediary-2 -lfoo -lbar -lbaz\n" \
pkgconf --libs intermediary-1 intermediary-2 pkgconf --libs intermediary-1 intermediary-2
} }
@ -230,7 +230,7 @@ libs_circular1_body()
libs_circular_directpc_body() libs_circular_directpc_body()
{ {
atf_check \ atf_check \
-o inline:"-lcircular-1 -lcircular-2 -lcircular-3 \n" \ -o inline:"-lcircular-1 -lcircular-2 -lcircular-3\n" \
pkgconf --libs ${selfdir}/lib1/circular-3.pc pkgconf --libs ${selfdir}/lib1/circular-3.pc
} }
@ -238,7 +238,7 @@ libs_static_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"/libfoo.a -pthread \n" \ -o inline:"/libfoo.a -pthread\n" \
pkgconf --libs static-archive-libs pkgconf --libs static-archive-libs
} }
@ -246,7 +246,7 @@ libs_static_ordering_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lbar -lfoo \n" \ -o inline:"-L/test/lib -lbar -lfoo\n" \
pkgconf --libs foo bar pkgconf --libs foo bar
} }
@ -254,20 +254,20 @@ pkg_config_path_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1${PATH_SEP}${selfdir}/lib2" export PKG_CONFIG_PATH="${selfdir}/lib1${PATH_SEP}${selfdir}/lib2"
atf_check \ atf_check \
-o inline:"-L/test/lib -lfoo \n" \ -o inline:"-L/test/lib -lfoo\n" \
pkgconf --libs foo pkgconf --libs foo
atf_check \ atf_check \
-o inline:"-L/test/lib -lbar -lfoo \n" \ -o inline:"-L/test/lib -lbar -lfoo\n" \
pkgconf --libs bar pkgconf --libs bar
} }
with_path_body() with_path_body()
{ {
atf_check \ atf_check \
-o inline:"-L/test/lib -lfoo \n" \ -o inline:"-L/test/lib -lfoo\n" \
pkgconf --with-path=${selfdir}/lib1 --with-path=${selfdir}/lib2 --libs foo pkgconf --with-path=${selfdir}/lib1 --with-path=${selfdir}/lib2 --libs foo
atf_check \ atf_check \
-o inline:"-L/test/lib -lbar -lfoo \n" \ -o inline:"-L/test/lib -lbar -lfoo\n" \
pkgconf --with-path=${selfdir}/lib1 --with-path=${selfdir}/lib2 --libs bar pkgconf --with-path=${selfdir}/lib1 --with-path=${selfdir}/lib2 --libs bar
} }
@ -291,7 +291,7 @@ arbitary_path_body()
{ {
cp ${selfdir}/lib1/foo.pc . cp ${selfdir}/lib1/foo.pc .
atf_check \ atf_check \
-o inline:"-L/test/lib -lfoo \n" \ -o inline:"-L/test/lib -lfoo\n" \
pkgconf --libs foo.pc pkgconf --libs foo.pc
} }

View File

@ -10,7 +10,7 @@ libs_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lconflicts \n" \ -o inline:"-L/test/lib -lconflicts\n" \
pkgconf --libs conflicts pkgconf --libs conflicts
} }
@ -18,6 +18,6 @@ ignore_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lconflicts \n" \ -o inline:"-L/test/lib -lconflicts\n" \
pkgconf --ignore-conflicts --libs conflicts pkgconf --ignore-conflicts --libs conflicts
} }

View File

@ -9,12 +9,12 @@ libs_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-F/test/lib -framework framework-1 \n" \ -o inline:"-F/test/lib -framework framework-1\n" \
pkgconf --libs framework-1 pkgconf --libs framework-1
atf_check \ atf_check \
-o inline:"-F/test/lib -framework framework-2 -framework framework-1 \n" \ -o inline:"-F/test/lib -framework framework-2 -framework framework-1\n" \
pkgconf --libs framework-2 pkgconf --libs framework-2
atf_check \ atf_check \
-o inline:"-F/test/lib -framework framework-2 -framework framework-1 \n" \ -o inline:"-F/test/lib -framework framework-2 -framework framework-1\n" \
pkgconf --libs framework-1 framework-2 pkgconf --libs framework-1 framework-2
} }

View File

@ -41,7 +41,7 @@ comments_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-lfoo \n" \ -o inline:"-lfoo\n" \
pkgconf --libs comments pkgconf --libs comments
} }
@ -49,7 +49,7 @@ comments_in_fields_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-lfoo \n" \ -o inline:"-lfoo\n" \
pkgconf --libs comments-in-fields pkgconf --libs comments-in-fields
} }
@ -57,7 +57,7 @@ dos_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib/dos-lineendings -ldos-lineendings \n" \ -o inline:"-L/test/lib/dos-lineendings -ldos-lineendings\n" \
pkgconf --libs dos-lineendings pkgconf --libs dos-lineendings
} }
@ -65,7 +65,7 @@ no_trailing_newline_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-I/test/include/no-trailing-newline \n" \ -o inline:"-I/test/include/no-trailing-newline\n" \
pkgconf --cflags no-trailing-newline pkgconf --cflags no-trailing-newline
} }
@ -73,7 +73,7 @@ argv_parse_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-llib-3 -llib-1 -llib-2 -lpthread \n" \ -o inline:"-llib-3 -llib-1 -llib-2 -lpthread\n" \
pkgconf --libs argv-parse pkgconf --libs argv-parse
} }
@ -90,7 +90,7 @@ argv_parse_3_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-llib-1 -pthread /test/lib/lib2.so \n" \ -o inline:"-llib-1 -pthread /test/lib/lib2.so\n" \
pkgconf --libs argv-parse-3 pkgconf --libs argv-parse-3
} }
@ -98,10 +98,10 @@ tilde_quoting_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L~ -ltilde \n" \ -o inline:"-L~ -ltilde\n" \
pkgconf --libs tilde-quoting pkgconf --libs tilde-quoting
atf_check \ atf_check \
-o inline:"-I~ \n" \ -o inline:"-I~\n" \
pkgconf --cflags tilde-quoting pkgconf --cflags tilde-quoting
} }
@ -109,7 +109,7 @@ paren_quoting_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L\$(libdir) -ltilde \n" \ -o inline:"-L\$(libdir) -ltilde\n" \
pkgconf --libs paren-quoting pkgconf --libs paren-quoting
} }
@ -134,7 +134,7 @@ escaped_backslash_body()
{ {
atf_check \ atf_check \
-e ignore \ -e ignore \
-o inline:"-IC:\\\\\\\\A \n" \ -o inline:"-IC:\\\\\\\\A\n" \
pkgconf --with-path=${selfdir}/lib1 --cflags escaped-backslash pkgconf --with-path=${selfdir}/lib1 --cflags escaped-backslash
} }
@ -142,7 +142,7 @@ quoted_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-DQUOTED=\\\"bla\\\" \n" \ -o inline:"-DQUOTED=\\\"bla\\\"\n" \
pkgconf --cflags quotes pkgconf --cflags quotes
} }
@ -150,7 +150,7 @@ flag_order_1_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -Bdynamic -lfoo -Bstatic -lbar \n" \ -o inline:"-L/test/lib -Bdynamic -lfoo -Bstatic -lbar\n" \
pkgconf --libs flag-order-1 pkgconf --libs flag-order-1
} }
@ -158,7 +158,7 @@ flag_order_2_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -Bdynamic -lfoo -Bstatic -lbar -lfoo \n" \ -o inline:"-L/test/lib -Bdynamic -lfoo -Bstatic -lbar -lfoo\n" \
pkgconf --libs flag-order-1 foo pkgconf --libs flag-order-1 foo
} }
@ -166,7 +166,7 @@ flag_order_3_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group \n" \ -o inline:"-L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group\n" \
pkgconf --libs flag-order-3 pkgconf --libs flag-order-3
} }
@ -174,7 +174,7 @@ flag_order_4_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group -lfoo \n" \ -o inline:"-L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group -lfoo\n" \
pkgconf --libs flag-order-3 foo pkgconf --libs flag-order-3 foo
} }
@ -182,7 +182,7 @@ variable_whitespace_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-I/test/include \n" \ -o inline:"-I/test/include\n" \
pkgconf --cflags variable-whitespace pkgconf --cflags variable-whitespace
} }
@ -190,7 +190,7 @@ fragment_quoting_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\"/test/share/doc\\\" \n" \ -o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\"/test/share/doc\\\"\n" \
pkgconf --cflags fragment-quoting pkgconf --cflags fragment-quoting
} }
@ -198,7 +198,7 @@ fragment_quoting_2_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -DQUOTED=/test/share/doc \n" \ -o inline:"-fPIC -I/test/include/foo -DQUOTED=/test/share/doc\n" \
pkgconf --cflags fragment-quoting-2 pkgconf --cflags fragment-quoting-2
} }
@ -206,7 +206,7 @@ fragment_quoting_3_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\"/test/share/doc\\\" \n" \ -o inline:"-fPIC -I/test/include/foo -DQUOTED=\\\"/test/share/doc\\\"\n" \
pkgconf --cflags fragment-quoting-3 pkgconf --cflags fragment-quoting-3
} }
@ -214,7 +214,7 @@ fragment_quoting_5_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -DQUOTED=/test/share/doc \n" \ -o inline:"-fPIC -I/test/include/foo -DQUOTED=/test/share/doc\n" \
pkgconf --cflags fragment-quoting-5 pkgconf --cflags fragment-quoting-5
} }
@ -222,28 +222,28 @@ fragment_quoting_7_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-Dhello=10 -Dworld=+32 -DDEFINED_FROM_PKG_CONFIG=hello\\ world \n" \ -o inline:"-Dhello=10 -Dworld=+32 -DDEFINED_FROM_PKG_CONFIG=hello\\ world\n" \
pkgconf --cflags fragment-quoting-7 pkgconf --cflags fragment-quoting-7
} }
fragment_escaping_1_body() fragment_escaping_1_body()
{ {
atf_check \ atf_check \
-o inline:"-IC:\\\\\\\\D\\ E \n" \ -o inline:"-IC:\\\\\\\\D\\ E\n" \
pkgconf --with-path="${selfdir}/lib1" --cflags fragment-escaping-1 pkgconf --with-path="${selfdir}/lib1" --cflags fragment-escaping-1
} }
fragment_escaping_2_body() fragment_escaping_2_body()
{ {
atf_check \ atf_check \
-o inline:"-IC:\\\\\\\\D\\ E \n" \ -o inline:"-IC:\\\\\\\\D\\ E\n" \
pkgconf --with-path="${selfdir}/lib1" --cflags fragment-escaping-2 pkgconf --with-path="${selfdir}/lib1" --cflags fragment-escaping-2
} }
fragment_escaping_3_body() fragment_escaping_3_body()
{ {
atf_check \ atf_check \
-o inline:"-IC:\\\\\\\\D\\ E \n" \ -o inline:"-IC:\\\\\\\\D\\ E\n" \
pkgconf --with-path="${selfdir}/lib1" --cflags fragment-escaping-3 pkgconf --with-path="${selfdir}/lib1" --cflags fragment-escaping-3
} }
@ -269,7 +269,7 @@ fragment_quoting_7a_body()
fragment_comment_body() fragment_comment_body()
{ {
atf_check \ atf_check \
-o inline:'kuku=\#ttt \n' \ -o inline:'kuku=\#ttt\n' \
pkgconf --with-path="${selfdir}/lib1" --cflags fragment-comment pkgconf --with-path="${selfdir}/lib1" --cflags fragment-comment
} }
@ -292,7 +292,7 @@ msvc_fragment_render_cflags_body()
tuple_dequote_body() tuple_dequote_body()
{ {
atf_check \ atf_check \
-o inline:'-L/test/lib -lfoo \n' \ -o inline:'-L/test/lib -lfoo\n' \
pkgconf --with-path="${selfdir}/lib1" --libs tuple-quoting pkgconf --with-path="${selfdir}/lib1" --libs tuple-quoting
} }

View File

@ -27,7 +27,7 @@ provides = 1.2.3
-o inline:"${OUTPUT}" \ -o inline:"${OUTPUT}" \
pkgconf --print-provides provides pkgconf --print-provides provides
atf_check \ atf_check \
-o inline:"-lfoo \n" \ -o inline:"-lfoo\n" \
pkgconf --libs provides-request-simple pkgconf --libs provides-request-simple
atf_check \ atf_check \
-e ignore \ -e ignore \

View File

@ -98,7 +98,7 @@ keep_system_libs_body()
pkgconf --libs-only-L cflags-libs-only pkgconf --libs-only-L cflags-libs-only
atf_check \ atf_check \
-o inline:"-L/test/local/lib \n" \ -o inline:"-L/test/local/lib\n" \
pkgconf --libs-only-L --keep-system-libs cflags-libs-only pkgconf --libs-only-L --keep-system-libs cflags-libs-only
} }
@ -106,7 +106,7 @@ libs_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/local/lib -lfoo \n" \ -o inline:"-L/test/local/lib -lfoo\n" \
pkgconf --libs cflags-libs-only pkgconf --libs cflags-libs-only
} }
@ -114,7 +114,7 @@ libs_only_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/local/lib -lfoo \n" \ -o inline:"-L/test/local/lib -lfoo\n" \
pkgconf --libs-only-L --libs-only-l cflags-libs-only pkgconf --libs-only-L --libs-only-l cflags-libs-only
} }
@ -122,10 +122,10 @@ libs_never_mergeback_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/bar/lib -lfoo1 \n" \ -o inline:"-L/test/bar/lib -lfoo1\n" \
pkgconf --libs prefix-foo1 pkgconf --libs prefix-foo1
atf_check \ atf_check \
-o inline:"-L/test/bar/lib -lfoo1 -lfoo2 \n" \ -o inline:"-L/test/bar/lib -lfoo1 -lfoo2\n" \
pkgconf --libs prefix-foo1 prefix-foo2 pkgconf --libs prefix-foo1 prefix-foo2
} }
@ -133,7 +133,7 @@ cflags_only_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-I/test/local/include/foo \n" \ -o inline:"-I/test/local/include/foo\n" \
pkgconf --cflags-only-I --cflags-only-other cflags-libs-only pkgconf --cflags-only-I --cflags-only-other cflags-libs-only
} }
@ -141,7 +141,7 @@ cflags_never_mergeback_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-I/test/bar/include/foo -DBAR -fPIC -DFOO \n" \ -o inline:"-I/test/bar/include/foo -DBAR -fPIC -DFOO\n" \
pkgconf --cflags prefix-foo1 prefix-foo2 pkgconf --cflags prefix-foo1 prefix-foo2
} }
@ -165,7 +165,7 @@ isystem_munge_order_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-isystem /opt/bad/include -isystem /opt/bad2/include \n" \ -o inline:"-isystem /opt/bad/include -isystem /opt/bad2/include\n" \
pkgconf --cflags isystem pkgconf --cflags isystem
} }
@ -181,7 +181,7 @@ idirafter_munge_order_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-idirafter /opt/bad/include -idirafter /opt/bad2/include \n" \ -o inline:"-idirafter /opt/bad/include -idirafter /opt/bad2/include\n" \
pkgconf --cflags idirafter pkgconf --cflags idirafter
} }
@ -197,7 +197,7 @@ idirafter_ordering_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-I/opt/bad/include1 -idirafter -I/opt/bad/include2 -I/opt/bad/include3 \n" \ -o inline:"-I/opt/bad/include1 -idirafter -I/opt/bad/include2 -I/opt/bad/include3\n" \
pkgconf --cflags idirafter-ordering pkgconf --cflags idirafter-ordering
} }
@ -205,7 +205,7 @@ pcpath_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib2" export PKG_CONFIG_PATH="${selfdir}/lib2"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo \n" \ -o inline:"-fPIC -I/test/include/foo\n" \
pkgconf --cflags ${selfdir}/lib3/bar.pc pkgconf --cflags ${selfdir}/lib3/bar.pc
} }
@ -214,7 +214,7 @@ sysroot_munge_body()
sed "s|/sysroot/|${selfdir}/|g" ${selfdir}/lib1/sysroot-dir.pc > ${selfdir}/lib1/sysroot-dir-selfdir.pc sed "s|/sysroot/|${selfdir}/|g" ${selfdir}/lib1/sysroot-dir.pc > ${selfdir}/lib1/sysroot-dir-selfdir.pc
export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}" export PKG_CONFIG_PATH="${selfdir}/lib1" PKG_CONFIG_SYSROOT_DIR="${selfdir}"
atf_check \ atf_check \
-o inline:"-L${selfdir}/lib -lfoo \n" \ -o inline:"-L${selfdir}/lib -lfoo\n" \
pkgconf --libs sysroot-dir-selfdir pkgconf --libs sysroot-dir-selfdir
} }
@ -233,7 +233,7 @@ virtual_variable_body()
fragment_collision_body() fragment_collision_body()
{ {
atf_check -o inline:"-D_BAZ -D_FOO -D_BAR -D_THREAD_SAFE -pthread \n" \ atf_check -o inline:"-D_BAZ -D_FOO -D_BAR -D_THREAD_SAFE -pthread\n" \
pkgconf --with-path="${selfdir}/lib1" --cflags fragment-collision pkgconf --with-path="${selfdir}/lib1" --cflags fragment-collision
} }
@ -264,7 +264,7 @@ empty_tuple_body()
solver_requires_private_debounce_body() solver_requires_private_debounce_body()
{ {
atf_check -o inline:"-I/metapackage-1 -I/metapackage-2 -lmetapackage-1 -lmetapackage-2 \n" \ atf_check -o inline:"-I/metapackage-1 -I/metapackage-2 -lmetapackage-1 -lmetapackage-2\n" \
pkgconf --with-path="${selfdir}/lib1" --cflags --libs metapackage pkgconf --with-path="${selfdir}/lib1" --cflags --libs metapackage
} }

View File

@ -21,7 +21,7 @@ libs_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lbar -lfoo \n" \ -o inline:"-L/test/lib -lbar -lfoo\n" \
pkgconf --libs bar pkgconf --libs bar
} }
@ -29,7 +29,7 @@ libs_cflags_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbaz \n" \ -o inline:"-fPIC -I/test/include/foo -L/test/lib -lbaz\n" \
pkgconf --libs --cflags baz pkgconf --libs --cflags baz
} }
@ -37,7 +37,7 @@ libs_static_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lbaz -L/test/lib -lzee -L/test/lib -lfoo \n" \ -o inline:"-L/test/lib -lbaz -L/test/lib -lzee -L/test/lib -lfoo\n" \
pkgconf --static --libs baz pkgconf --static --libs baz
} }
@ -45,7 +45,7 @@ libs_static_pure_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lbaz -L/test/lib -lfoo \n" \ -o inline:"-L/test/lib -lbaz -L/test/lib -lfoo\n" \
pkgconf --static --pure --libs baz pkgconf --static --pure --libs baz
} }
@ -53,7 +53,7 @@ argv_parse2_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-llib-1 -pthread /test/lib/lib2.so \n" \ -o inline:"-llib-1 -pthread /test/lib/lib2.so\n" \
pkgconf --static --libs argv-parse-2 pkgconf --static --libs argv-parse-2
} }
@ -61,7 +61,7 @@ static_cflags_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo -DFOO_STATIC \n" \ -o inline:"-fPIC -I/test/include/foo -DFOO_STATIC\n" \
pkgconf --static --cflags baz pkgconf --static --cflags baz
} }
@ -69,7 +69,7 @@ private_duplication_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-lprivate -lfoo -lbaz -lzee -lfoo -lbar \n" \ -o inline:"-lprivate -lfoo -lbaz -lzee -lfoo -lbar\n" \
pkgconf --static --libs-only-l private-libs-duplication pkgconf --static --libs-only-l private-libs-duplication
} }
@ -77,7 +77,7 @@ libs_static2_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-lbar -lbar-private -L/test/lib -lfoo \n" \ -o inline:"-lbar -lbar-private -L/test/lib -lfoo\n" \
pkgconf --static --libs static-libs pkgconf --static --libs static-libs
} }
@ -94,7 +94,7 @@ missing_body()
requires_internal_body() requires_internal_body()
{ {
atf_check \ atf_check \
-o inline:"-lbar -lbar-private -L/test/lib -lfoo \n" \ -o inline:"-lbar -lbar-private -L/test/lib -lfoo\n" \
pkgconf --with-path="${selfdir}/lib1" --static --libs requires-internal pkgconf --with-path="${selfdir}/lib1" --static --libs requires-internal
} }
@ -110,7 +110,7 @@ requires_internal_missing_body()
requires_internal_collision_body() requires_internal_collision_body()
{ {
atf_check \ atf_check \
-o inline:"-I/test/local/include/foo \n" \ -o inline:"-I/test/local/include/foo\n" \
pkgconf --with-path="${selfdir}/lib1" --cflags requires-internal-collision pkgconf --with-path="${selfdir}/lib1" --cflags requires-internal-collision
} }

View File

@ -17,7 +17,7 @@ do_not_eat_slash_body()
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
export PKG_CONFIG_SYSROOT_DIR="/" export PKG_CONFIG_SYSROOT_DIR="/"
atf_check \ atf_check \
-o inline:"-fPIC -I/test/include/foo \n" \ -o inline:"-fPIC -I/test/include/foo\n" \
pkgconf --cflags baz pkgconf --cflags baz
} }
@ -26,7 +26,7 @@ cflags_body()
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
export PKG_CONFIG_SYSROOT_DIR="${SYSROOT_DIR}" export PKG_CONFIG_SYSROOT_DIR="${SYSROOT_DIR}"
atf_check \ atf_check \
-o inline:"-fPIC -I${SYSROOT_DIR}/test/include/foo \n" \ -o inline:"-fPIC -I${SYSROOT_DIR}/test/include/foo\n" \
pkgconf --cflags baz pkgconf --cflags baz
} }
@ -48,21 +48,21 @@ do_not_duplicate_sysroot_dir_body()
export PKG_CONFIG_SYSROOT_DIR="/sysroot" export PKG_CONFIG_SYSROOT_DIR="/sysroot"
atf_check \ atf_check \
-o inline:"-I/sysroot/usr/include \n" \ -o inline:"-I/sysroot/usr/include\n" \
pkgconf --cflags sysroot-dir-2 pkgconf --cflags sysroot-dir-2
atf_check \ atf_check \
-o inline:"-I/sysroot/usr/include \n" \ -o inline:"-I/sysroot/usr/include\n" \
pkgconf --cflags sysroot-dir-3 pkgconf --cflags sysroot-dir-3
atf_check \ atf_check \
-o inline:"-I/sysroot/usr/include \n" \ -o inline:"-I/sysroot/usr/include\n" \
pkgconf --cflags sysroot-dir-5 pkgconf --cflags sysroot-dir-5
export PKG_CONFIG_SYSROOT_DIR="${SYSROOT_DIR}" export PKG_CONFIG_SYSROOT_DIR="${SYSROOT_DIR}"
atf_check \ atf_check \
-o inline:"-I${SYSROOT_DIR}/usr/include \n" \ -o inline:"-I${SYSROOT_DIR}/usr/include\n" \
pkgconf --cflags sysroot-dir-4 pkgconf --cflags sysroot-dir-4
} }
@ -72,7 +72,7 @@ uninstalled_body()
export PKG_CONFIG_SYSROOT_DIR="/sysroot" export PKG_CONFIG_SYSROOT_DIR="/sysroot"
atf_check \ atf_check \
-o inline:"-L/test/lib -lomg \n" \ -o inline:"-L/test/lib -lomg\n" \
pkgconf --libs omg pkgconf --libs omg
} }
@ -83,7 +83,7 @@ uninstalled_pkgconf1_body()
export PKG_CONFIG_PKGCONF1_SYSROOT_RULES="1" export PKG_CONFIG_PKGCONF1_SYSROOT_RULES="1"
atf_check \ atf_check \
-o inline:"-L/sysroot/test/lib -lomg \n" \ -o inline:"-L/sysroot/test/lib -lomg\n" \
pkgconf --libs omg pkgconf --libs omg
} }
@ -94,7 +94,7 @@ uninstalled_fdo_body()
export PKG_CONFIG_FDO_SYSROOT_RULES="1" export PKG_CONFIG_FDO_SYSROOT_RULES="1"
atf_check \ atf_check \
-o inline:"-L/test/lib -lomg \n" \ -o inline:"-L/test/lib -lomg\n" \
pkgconf --libs omg pkgconf --libs omg
} }
@ -105,6 +105,6 @@ uninstalled_fdo_pc_sysrootdir_body()
export PKG_CONFIG_FDO_SYSROOT_RULES="1" export PKG_CONFIG_FDO_SYSROOT_RULES="1"
atf_check \ atf_check \
-o inline:"-L/sysroot/test/lib -lomg \n" \ -o inline:"-L/sysroot/test/lib -lomg\n" \
pkgconf --libs omg-sysroot pkgconf --libs omg-sysroot
} }