cypress and C++ tests: enable full trace logging to keep timing the s…

…ame. It appears that both cypress and the C++ WOPI tests are extremely timing sensitive, and fixing this should not hold up merging the logging improvements. So for now don't disable logging in these modes. Signed-off-by: Michael Meeks <[email protected]> Change-Id: I43e8397263e6960b668a29e7ad67f45394c52b52
CollaboraOnline · May 14, 2024 · 752a599 · 752a599
1 parent 28e4e21
commit 752a599
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/common/Unit.cpp b/common/Unit.cpp
@@ -231,6 +231,11 @@ bool UnitBase::init(UnitType type, const std::string &unitLibPath)
  return false;
  }
 
+ // For now enable full logging
+ // FIXME: remove this when time sensitive WOPI
+ // tests are fixed.
+ Log::setDisabledAreas("");
+
  initTestSuiteOptions();
 
  // Filter tests.

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
@@ -203,7 +203,7 @@ define start_coolwsd_instance
  --o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
  --o:admin_console.username=admin --o:admin_console.password=admin \
  --o:logging.file[@enable]=true --o:logging.level=trace \
- --o:welcome.enable=false \
+ --o:logging.disabled_areas="" --o:welcome.enable=false \
  --o:user_interface.mode=$(USER_INTERFACE) \
  --o:accessibility.enable=$(A11Y_ENABLE) \
  --o:security.enable_macros_execution=true \