summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ctor.cc36
-rw-r--r--test/suite/ctor_files/ctor.cc.bar24
-rw-r--r--test/suite/ctor_files/ctor.cc.base24
-rw-r--r--test/suite/ctor_files/ctor.cc.multi24
4 files changed, 63 insertions, 45 deletions
diff --git a/test/ctor.cc b/test/ctor.cc
index 0c3acfd..6515c72 100644
--- a/test/ctor.cc
+++ b/test/ctor.cc
@@ -17,12 +17,14 @@ BuildConfigurations ctorTestConfigs()
"testmain.cc",
"../src/execute.cc",
},
- .cxxflags = {
- "-std=c++20", "-O3", "-s", "-Wall", "-Werror",
- "-I../src", "-Iuunit",
- "-DOUTPUT=\"execute\"",
+ .flags = {
+ .cxxflags = {
+ "-std=c++20", "-O3", "-s", "-Wall", "-Werror",
+ "-I../src", "-Iuunit",
+ "-DOUTPUT=\"execute\"",
+ },
+ .ldflags = { "-pthread" },
},
- .ldflags = { "-pthread" },
},
{
.type = TargetType::UnitTest,
@@ -32,12 +34,14 @@ BuildConfigurations ctorTestConfigs()
"testmain.cc",
},
.depends = {"libctor.a"},
- .cxxflags = {
- "-std=c++20", "-O3", "-s", "-Wall", "-Werror",
- "-I../src", "-Iuunit",
- "-DOUTPUT=\"tasks\"",
+ .flags = {
+ .cxxflags = {
+ "-std=c++20", "-O3", "-s", "-Wall", "-Werror",
+ "-I../src", "-Iuunit",
+ "-DOUTPUT=\"tasks\"",
+ },
+ .ldflags = { "-pthread" },
},
- .ldflags = { "-pthread" },
},
{
.type = TargetType::UnitTest,
@@ -47,12 +51,14 @@ BuildConfigurations ctorTestConfigs()
"testmain.cc",
},
.depends = {"libctor.a"},
- .cxxflags = {
- "-std=c++20", "-O3", "-s", "-Wall", "-Werror",
- "-I../src", "-Iuunit",
- "-DOUTPUT=\"source_type\"",
+ .flags = {
+ .cxxflags = {
+ "-std=c++20", "-O3", "-s", "-Wall", "-Werror",
+ "-I../src", "-Iuunit",
+ "-DOUTPUT=\"source_type\"",
+ },
+ .ldflags = { "-pthread" },
},
- .ldflags = { "-pthread" },
},
};
}
diff --git a/test/suite/ctor_files/ctor.cc.bar b/test/suite/ctor_files/ctor.cc.bar
index 2c9df2a..92456cb 100644
--- a/test/suite/ctor_files/ctor.cc.bar
+++ b/test/suite/ctor_files/ctor.cc.bar
@@ -16,12 +16,14 @@ BuildConfigurations ctorConfigs()
.sources = {
"hello.cc",
},
- .cxxflags = {
- "-std=c++20",
- "-O3",
- "-g",
- "-Wall",
- "-Werror",
+ .flags = {
+ .cxxflags = {
+ "-std=c++20",
+ "-O3",
+ "-g",
+ "-Wall",
+ "-Werror",
+ },
},
.externals = {"bar"},
}
@@ -34,10 +36,12 @@ ExternalConfigurations ctorExtConfigs()
{
{
.name = "bar",
- .cxxflags = { "-D_A_", "-DBAR"},
- .cflags = { "-D_B_" },
- .ldflags = { "-D_C_" },
- .asmflags = { "-D_D_" },
+ .flags = {
+ .cxxflags = { "-D_A_", "-DBAR"},
+ .cflags = { "-D_B_" },
+ .ldflags = { "-D_C_" },
+ .asmflags = { "-D_D_" },
+ },
// Creates --with-foo-prefix arg to configure which will be used for
// -L and -I flags.
// If not specified configure will try to find them in the system paths.
diff --git a/test/suite/ctor_files/ctor.cc.base b/test/suite/ctor_files/ctor.cc.base
index d9b8e4d..6c60513 100644
--- a/test/suite/ctor_files/ctor.cc.base
+++ b/test/suite/ctor_files/ctor.cc.base
@@ -16,12 +16,14 @@ BuildConfigurations ctorConfigs()
.sources = {
"hello.cc",
},
- .cxxflags = {
- "-std=c++20",
- "-O3",
- "-g",
- "-Wall",
- "-Werror",
+ .flags = {
+ .cxxflags = {
+ "-std=c++20",
+ "-O3",
+ "-g",
+ "-Wall",
+ "-Werror",
+ },
},
.externals = {"bar"},
}
@@ -34,10 +36,12 @@ ExternalConfigurations ctorExtConfigs()
{
{
.name = "bar",
- .cxxflags = { "-D_A_", "-DFOO"},
- .cflags = { "-D_B_" },
- .ldflags = { "-D_C_" },
- .asmflags = { "-D_D_" },
+ .flags = {
+ .cxxflags = { "-D_A_", "-DFOO"},
+ .cflags = { "-D_B_" },
+ .ldflags = { "-D_C_" },
+ .asmflags = { "-D_D_" },
+ },
// Creates --with-foo-prefix arg to configure which will be used for
// -L and -I flags.
// If not specified configure will try to find them in the system paths.
diff --git a/test/suite/ctor_files/ctor.cc.multi b/test/suite/ctor_files/ctor.cc.multi
index d518337..9db2517 100644
--- a/test/suite/ctor_files/ctor.cc.multi
+++ b/test/suite/ctor_files/ctor.cc.multi
@@ -18,12 +18,14 @@ BuildConfigurations ctorConfigs()
.sources = {
"hello.cc",
},
- .cxxflags = {
- "-std=c++20",
- "-O3",
- "-g",
- "-Wall",
- "-Werror",
+ .flags = {
+ .cxxflags = {
+ "-std=c++20",
+ "-O3",
+ "-g",
+ "-Wall",
+ "-Werror",
+ },
},
.externals = {"bar"},
}
@@ -36,10 +38,12 @@ ExternalConfigurations ctorExtConfigs()
{
{
.name = "bar",
- .cxxflags = { "-D_A_", "-DFOO"},
- .cflags = { "-D_B_" },
- .ldflags = { "-D_C_" },
- .asmflags = { "-D_D_" },
+ .flags = {
+ .cxxflags = { "-D_A_", "-DFOO"},
+ .cflags = { "-D_B_" },
+ .ldflags = { "-D_C_" },
+ .asmflags = { "-D_D_" },
+ },
// Creates --with-foo-prefix arg to configure which will be used for
// -L and -I flags.
// If not specified configure will try to find them in the system paths.