diff options
author | dec05eba <dec05eba@protonmail.com> | 2018-06-05 14:35:35 +0200 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2020-07-06 07:39:32 +0200 |
commit | 1d5e662109b45fdde8b56bf036565cc8d372839d (patch) | |
tree | 5a23d1bc88bc3a126493392650c957c771546410 /backend | |
parent | 31afceeade6dd852a8b7a71805b21a20e502229a (diff) |
Fix tests built twice instead of once
Diffstat (limited to 'backend')
-rw-r--r-- | backend/ninja/Ninja.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp index c72c99f..45fb9cb 100644 --- a/backend/ninja/Ninja.cpp +++ b/backend/ninja/Ninja.cpp @@ -995,20 +995,17 @@ namespace backend buildPath += TINYDIR_STRING("/sibs-build/release"); break; } + Result<bool> buildFileResult = ninja.build(sibsTestConfig, buildPath.c_str()); if (!buildFileResult) return buildFileResult; - - Result<bool> buildResult = ninja.compile(buildPath.c_str()); - if (!buildResult) - return buildResult; // Convenient to have project setup to tests as well if(config.isMainProject()) { - buildResult = buildCompilationDatabase(buildPath.c_str()); - if(!buildResult) - return buildResult; + buildFileResult = buildCompilationDatabase(buildPath.c_str()); + if(!buildFileResult) + return buildFileResult; } FileString testExecutableName = buildPath; |