tests: fix up some test changes from the solver optimizations

the output of pkgconf is basically functionally equivalent in both cases
master
Ariadne Conill 2022-06-26 18:22:04 +00:00
parent 04a6dda79f
commit ab352222a2
2 changed files with 3 additions and 3 deletions

View File

@ -72,7 +72,7 @@ libs_cflags_version_multiple_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" export PKG_CONFIG_PATH="${selfdir}/lib1"
atf_check \ atf_check \
-o inline:"-I/test/include/foo -fPIC -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'
} }
@ -80,7 +80,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:"-I/test/include/foo -fPIC -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'
} }

View File

@ -223,7 +223,7 @@ virtual_variable_body()
fragment_collision_body() fragment_collision_body()
{ {
atf_check -o inline:"-D_BAZ -D_BAR -D_FOO -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
} }