From ab352222a212b25d0c10d762d6ed1c239278bcf9 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Sun, 26 Jun 2022 18:22:04 +0000 Subject: [PATCH] tests: fix up some test changes from the solver optimizations the output of pkgconf is basically functionally equivalent in both cases --- tests/basic.sh | 4 ++-- tests/regress.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/basic.sh b/tests/basic.sh index 4e87c80..d9c8f2c 100755 --- a/tests/basic.sh +++ b/tests/basic.sh @@ -72,7 +72,7 @@ libs_cflags_version_multiple_body() { export PKG_CONFIG_PATH="${selfdir}/lib1" 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' } @@ -80,7 +80,7 @@ libs_cflags_version_multiple_coma_body() { export PKG_CONFIG_PATH="${selfdir}/lib1" 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' } diff --git a/tests/regress.sh b/tests/regress.sh index 2a809ed..cc397ad 100755 --- a/tests/regress.sh +++ b/tests/regress.sh @@ -223,7 +223,7 @@ virtual_variable_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 }