diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2022-08-21 09:47:53 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2022-08-21 09:47:53 +0200 |
commit | 33f70be85ef83b0ebeaa6755b67558ae2f5ae8e6 (patch) | |
tree | 9f6c39530b524bb5257d8f0f220eb9fc08bc6381 /test/ctor.cc | |
parent | 7436d83ef371d4fee4a66bec235e102ed80275db (diff) |
WIP: unit-test fixes
Diffstat (limited to 'test/ctor.cc')
-rw-r--r-- | test/ctor.cc | 78 |
1 files changed, 57 insertions, 21 deletions
diff --git a/test/ctor.cc b/test/ctor.cc index 9b690a2..9a6ec91 100644 --- a/test/ctor.cc +++ b/test/ctor.cc @@ -19,11 +19,16 @@ BuildConfigurations ctorTestConfigs(const Settings& settings) }, .flags = { .cxxflags = { - "-std=c++20", "-O3", "-s", "-Wall", "-Werror", - "-I../src", "-Iuunit", - "-DOUTPUT=\"execute\"", + "/std:c++20", "/O2",// "/Wall",// "/WX", + "/I../src", "/Iuunit", + "/Isrc", "/Itest/uunit", + "/DOUTPUT=\\\"execute\\\"", + "/nologo", + "/EHsc", + "/D_X86_", }, - .ldflags = { "-pthread" }, + //.ldflags = { "/pthread" }, + .ldflags = { "/nologo" }, }, }, { @@ -33,14 +38,19 @@ BuildConfigurations ctorTestConfigs(const Settings& settings) "tasks_test.cc", "testmain.cc", }, - .depends = { "libctor_nomain.a" }, + .depends = { "libctor_nomain.lib" }, .flags = { .cxxflags = { - "-std=c++20", "-O3", "-s", "-Wall", "-Werror", - "-I../src", "-Iuunit", - "-DOUTPUT=\"tasks\"", + "/std:c++20", "/O2",// "/Wall",// "/WX", + "/I../src", "/Iuunit", + "/Isrc", "/Itest/uunit", + "/DOUTPUT=\\\"tasks\\\"", + "/nologo", + "/EHsc", + "/D_X86_", }, - .ldflags = { "-pthread" }, + //.ldflags = { "/pthread" }, + .ldflags = { "/nologo" }, }, }, { @@ -50,14 +60,19 @@ BuildConfigurations ctorTestConfigs(const Settings& settings) "source_type_test.cc", "testmain.cc", }, - .depends = { "libctor_nomain.a" }, + .depends = { "libctor_nomain.lib" }, .flags = { .cxxflags = { - "-std=c++20", "-O3", "-s", "-Wall", "-Werror", - "-I../src", "-Iuunit", - "-DOUTPUT=\"source_type\"", + "/std:c++20", "/O2",// "/Wall",// "/WX", + "/I../src", "/Iuunit", + "/Isrc", "/Itest/uunit", + "/DOUTPUT=\\\"source_type\\\"", + "/nologo", + "/EHsc", + "/D_X86_", }, - .ldflags = { "-pthread" }, + //.ldflags = { "/pthread" }, + .ldflags = { "/nologo" }, }, }, { @@ -71,15 +86,20 @@ BuildConfigurations ctorTestConfigs(const Settings& settings) //.depends = { "libctor_nomain.a" }, .flags = { .cxxflags = { - "-std=c++20", "-O3", "-Wall", "-Werror", - "-I../src", "-Iuunit", - "-DOUTPUT=\"tools\"", + "/std:c++20", "/O2",// "/Wall",// "/WX", + "/I../src", "/Iuunit", + "/Isrc", "/Itest/uunit", + "/DOUTPUT=\\\"tools\\\"", + "/nologo", + "/EHsc", + "/D_X86_", }, + .ldflags = { "/nologo" }, }, }, { .type = TargetType::UnitTestLib, - .target = "libctor_nomain.a", + .target = "libctor_nomain.lib", .sources = { "../src/build.cc", "../src/configure.cc", @@ -95,13 +115,29 @@ BuildConfigurations ctorTestConfigs(const Settings& settings) "../src/tools.cc", "../src/util.cc", "../src/externals_manual.cc", + "../getopt-for-windows/getopt.c", }, .flags = { .cxxflags = { - "-std=c++20", "-O3", "-s", "-Wall", "-Werror", - "-I../src", + "/std:c++20", "/O2",// "/Wall",// "/WX", + "/I../src", + "/Isrc", + "/nologo", + "/EHsc", + "/D_X86_", + "/Igetopt-for-windows", }, - .ldflags = { "-pthread" }, + .cflags = { + //"/std:c++20", "/O2",// "/Wall",// "/WX", + "/I../src", + "/Isrc", + "/nologo", + "/EHsc", + "/D_X86_", + "/Igetopt-for-windows", + }, + //.ldflags = { "/pthread" }, + .ldflags = { "/nologo" }, }, }, }; |