From 3bc327655b1061871995749dfe42bbd016cefdb4 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@ariadne.space>
Date: Fri, 2 Jan 2026 23:47:55 -0800
Subject: [PATCH] tests: move some flag ordering tests over from kyua

Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
---
 Makefile.am                  |  4 ++++
 t/ordering/flag-order-1.test |  4 ++++
 t/ordering/flag-order-2.test |  4 ++++
 t/ordering/flag-order-3.test |  4 ++++
 t/ordering/flag-order-4.test |  4 ++++
 tests/parser.sh              | 36 ------------------------------------
 6 files changed, 20 insertions(+), 36 deletions(-)
 create mode 100644 t/ordering/flag-order-1.test
 create mode 100644 t/ordering/flag-order-2.test
 create mode 100644 t/ordering/flag-order-3.test
 create mode 100644 t/ordering/flag-order-4.test

diff --git a/Makefile.am b/Makefile.am
index 8a2f1e8..45adc3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,10 @@ EXTRA_DIST =	pkg.m4 \
 		t/basic/variable-env.test \
 		t/basic/variable-no-recursion.test \
 		t/basic/variable.test \
+		t/ordering/flag-order-1.test \
+		t/ordering/flag-order-2.test \
+		t/ordering/flag-order-3.test \
+		t/ordering/flag-order-4.test \
 		t/ordering/fragment-collision.test \
 		t/ordering/framework-1.test \
 		t/ordering/framework-2.test \
diff --git a/t/ordering/flag-order-1.test b/t/ordering/flag-order-1.test
new file mode 100644
index 0000000..a68de1e
--- /dev/null
+++ b/t/ordering/flag-order-1.test
@@ -0,0 +1,4 @@
+PackageSearchPath: lib1
+Query: flag-order-1
+WantedFlags: libs
+ExpectedStdout: -L/test/lib -Bdynamic -lfoo -Bstatic -lbar
diff --git a/t/ordering/flag-order-2.test b/t/ordering/flag-order-2.test
new file mode 100644
index 0000000..5475c9e
--- /dev/null
+++ b/t/ordering/flag-order-2.test
@@ -0,0 +1,4 @@
+PackageSearchPath: lib1
+Query: flag-order-1, foo
+WantedFlags: libs
+ExpectedStdout: -L/test/lib -Bdynamic -lfoo -Bstatic -lbar -lfoo
diff --git a/t/ordering/flag-order-3.test b/t/ordering/flag-order-3.test
new file mode 100644
index 0000000..793cb60
--- /dev/null
+++ b/t/ordering/flag-order-3.test
@@ -0,0 +1,4 @@
+PackageSearchPath: lib1
+Query: flag-order-3
+WantedFlags: libs
+ExpectedStdout: -L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group
diff --git a/t/ordering/flag-order-4.test b/t/ordering/flag-order-4.test
new file mode 100644
index 0000000..cf9c912
--- /dev/null
+++ b/t/ordering/flag-order-4.test
@@ -0,0 +1,4 @@
+PackageSearchPath: lib1
+Query: flag-order-3, foo
+WantedFlags: libs
+ExpectedStdout: -L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group -lfoo
diff --git a/tests/parser.sh b/tests/parser.sh
index 2ab739f..624e31d 100755
--- a/tests/parser.sh
+++ b/tests/parser.sh
@@ -15,10 +15,6 @@ tests_init \
 	multiline_field \
 	multiline_bogus_header \
 	escaped_backslash \
-	flag_order_1 \
-	flag_order_2 \
-	flag_order_3 \
-	flag_order_4 \
 	quoted \
 	variable_whitespace \
 	fragment_escaping_1 \
@@ -152,38 +148,6 @@ quoted_body()
 		pkgconf --cflags quotes
 }
 
-flag_order_1_body()
-{
-	export PKG_CONFIG_PATH="${selfdir}/lib1"
-	atf_check \
-		-o inline:"-L/test/lib -Bdynamic -lfoo -Bstatic -lbar\n" \
-		pkgconf --libs flag-order-1
-}
-
-flag_order_2_body()
-{
-	export PKG_CONFIG_PATH="${selfdir}/lib1"
-	atf_check \
-		-o inline:"-L/test/lib -Bdynamic -lfoo -Bstatic -lbar -lfoo\n" \
-		pkgconf --libs flag-order-1 foo
-}
-
-flag_order_3_body()
-{
-	export PKG_CONFIG_PATH="${selfdir}/lib1"
-	atf_check \
-		-o inline:"-L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group\n" \
-		pkgconf --libs flag-order-3
-}
-
-flag_order_4_body()
-{
-	export PKG_CONFIG_PATH="${selfdir}/lib1"
-	atf_check \
-		-o inline:"-L/test/lib -Wl,--start-group -lfoo -lbar -Wl,--end-group -lfoo\n" \
-		pkgconf --libs flag-order-3 foo
-}
-
 variable_whitespace_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"