From d5c88fedf517e738490c32fa95097e03178903fe Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sat, 14 Jan 2023 11:14:39 +0100
Subject: Fix and run test-suite on ci server.

---
 test/suite/ctor_files/ctor.cc.bar   | 16 +++++++++-------
 test/suite/ctor_files/ctor.cc.base  | 17 ++++++++++-------
 test/suite/ctor_files/ctor.cc.multi | 16 +++++++++-------
 3 files changed, 28 insertions(+), 21 deletions(-)

(limited to 'test/suite/ctor_files')

diff --git a/test/suite/ctor_files/ctor.cc.bar b/test/suite/ctor_files/ctor.cc.bar
index d63b5e8..218f9cc 100644
--- a/test/suite/ctor_files/ctor.cc.bar
+++ b/test/suite/ctor_files/ctor.cc.bar
@@ -6,7 +6,7 @@
 
 namespace
 {
-BuildConfigurations ctorConfigs()
+ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 {
 	return
 	{
@@ -30,17 +30,19 @@ BuildConfigurations ctorConfigs()
 	};
 }
 
-ExternalConfigurations ctorExtConfigs()
+ctor::external_configurations ctorExtConfigs(const ctor::settings& settings)
 {
 	return
 	{
 		{
 			.name = "bar",
-			.flags = {
-				.cxxflags = { "-D_A_", "-DBAR"},
-				.cflags = { "-D_B_" },
-				.ldflags = { "-D_C_" },
-				.asmflags = { "-D_D_" },
+			.external = ctor::external_manual{
+				.flags = {
+					.cflags = { "-D_B_" },
+					.cxxflags = { "-D_A_", "-DBAR"},
+					.ldflags = { "-D_C_" },
+					.asmflags = { "-D_D_" },
+				},
 			},
 			// Creates --with-foo-prefix arg to configure which will be used for
 			// -L and -I flags.
diff --git a/test/suite/ctor_files/ctor.cc.base b/test/suite/ctor_files/ctor.cc.base
index 3de099d..eab39c4 100644
--- a/test/suite/ctor_files/ctor.cc.base
+++ b/test/suite/ctor_files/ctor.cc.base
@@ -6,7 +6,7 @@
 
 namespace
 {
-BuildConfigurations ctorConfigs()
+ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 {
 	return
 	{
@@ -30,17 +30,20 @@ BuildConfigurations ctorConfigs()
 	};
 }
 
-ExternalConfigurations ctorExtConfigs()
+ctor::external_configurations ctorExtConfigs(const ctor::settings& settings)
 {
 	return
 	{
 		{
 			.name = "bar",
-			.flags = {
-				.cxxflags = { "-D_A_", "-DFOO"},
-				.cflags = { "-D_B_" },
-				.ldflags = { "-D_C_" },
-				.asmflags = { "-D_D_" },
+			.external = ctor::external_manual
+			{
+				.flags = {
+					.cflags = { "-D_B_" },
+					.cxxflags = { "-D_A_", "-DFOO"},
+					.ldflags = { "-D_C_" },
+					.asmflags = { "-D_D_" },
+				},
 			},
 			// Creates --with-foo-prefix arg to configure which will be used for
 			// -L and -I flags.
diff --git a/test/suite/ctor_files/ctor.cc.multi b/test/suite/ctor_files/ctor.cc.multi
index d18d0d5..2b88afe 100644
--- a/test/suite/ctor_files/ctor.cc.multi
+++ b/test/suite/ctor_files/ctor.cc.multi
@@ -8,7 +8,7 @@
 
 namespace
 {
-BuildConfigurations ctorConfigs()
+ctor::build_configurations ctorConfigs(const ctor::settings& settings)
 {
 	return
 	{
@@ -32,17 +32,19 @@ BuildConfigurations ctorConfigs()
 	};
 }
 
-ExternalConfigurations ctorExtConfigs()
+ctor::external_configurations ctorExtConfigs(const ctor::settings& settings)
 {
 	return
 	{
 		{
 			.name = "bar",
-			.flags = {
-				.cxxflags = { "-D_A_", "-DFOO"},
-				.cflags = { "-D_B_" },
-				.ldflags = { "-D_C_" },
-				.asmflags = { "-D_D_" },
+			.external = ctor::external_manual{
+				.flags = {
+					.cflags = { "-D_B_" },
+					.cxxflags = { "-D_A_", "-DFOO"},
+					.ldflags = { "-D_C_" },
+					.asmflags = { "-D_D_" },
+				},
 			},
 			// Creates --with-foo-prefix arg to configure which will be used for
 			// -L and -I flags.
-- 
cgit v1.2.3