aboutsummaryrefslogtreecommitdiff
path: root/backend/ninja
diff options
context:
space:
mode:
Diffstat (limited to 'backend/ninja')
-rw-r--r--backend/ninja/Ninja.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp
index 814f190..d311110 100644
--- a/backend/ninja/Ninja.cpp
+++ b/backend/ninja/Ninja.cpp
@@ -921,20 +921,7 @@ namespace backend
if(testSourceDirs.empty() || !config.shouldBuildTests())
return Result<bool>::Ok(true);
- // Tests need parent project as dependency. Executables can't be included as dependency so we build it as dynamic library.
- // `build` also builds tests
- if(getNinjaLibraryType(config.getPackageType()) == LibraryType::EXECUTABLE)
- {
- SibsConfig parentProjConfigLib = config;
- parentProjConfigLib.setPackageType(PackageType::DYNAMIC);
- // HACK: We can build a package that is defined as executable and contains main function by redefining `main`
- // as something else.
- // TODO: Do not allow defining `main` in project.conf or as program argument to sibs (when sibs supports defines).
- // It's ok if `define` fails. It could fail if `main` has already been replaced by other tests somehow.
- parentProjConfigLib.define("main", "sibs_lib_ignore_main");
- parentProjConfigLib.define("wmain", "sibs_lib_ignore_wmain");
- return build(parentProjConfigLib, savePath, nullptr, nullptr);
- }
+ assert(getNinjaLibraryType(config.getPackageType()) != LibraryType::EXECUTABLE);
string parentProjectPathUtf8 = toUtf8(config.getProjectPath());
string parentExportIncludeDirs = parentDependencyExportIncludeDirs;