Test infra improvements (#1915)

DanShaders · web-flow · commit 64b8e65b4966 · 2025-11-24T20:31:29.000+03:00
* Do not manually enumerate tests in each and every CI build script

* Refactor test expectation macros to output failing line in logs

Previously, logs first recorded a random source line and then message
contained the line where the expectation failed.

* Add non-asserting test expectation macros

These fail test instead of killing the process.

* Print test results in the nicer format by default

Let's reserve LOG(ERROR) for errors.

Unfortunately, we cannot use this everywhere as test runner is also used
in TonlibClient, where custom log redirections can be set up.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -401,6 +401,13 @@ function(target_link_libraries_system target)
   endforeach(lib)
 endfunction(target_link_libraries_system)
 
+add_custom_target(all-tests)
+
+function(ton_test TEST_NAME)
+  add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME} ${ARGN})
+  add_dependencies(all-tests ${TEST_NAME})
+endfunction()
+
 set(TDUTILS_MIME_TYPE OFF CACHE BOOL "Generate mime type conversion")
 add_subdirectory(tdutils)
 add_subdirectory(memprof)
@@ -575,20 +582,18 @@ endif()
 enable_testing()
 set(TEST_OPTIONS "--regression ${CMAKE_CURRENT_SOURCE_DIR}/test/regression-tests.ans --filter -Bench")
 separate_arguments(TEST_OPTIONS)
-add_test(test-ed25519 test-ed25519)
-add_test(test-bigint test-bigint)
-add_test(test-vm test-vm ${TEST_OPTIONS})
-add_test(test-fift test-fift ${TEST_OPTIONS})
-add_test(test-cells test-cells ${TEST_OPTIONS})
-add_test(test-smartcont test-smartcont)
-add_test(test-net test-net)
-add_test(test-actors test-tdactor)
-add_test(test-actors-coro tdactor/test/test-coro)
-add_test(test-emulator test-emulator)
+ton_test(test-ed25519)
+ton_test(test-bigint)
+ton_test(test-vm ${TEST_OPTIONS})
+ton_test(test-fift ${TEST_OPTIONS})
+ton_test(test-cells ${TEST_OPTIONS})
+ton_test(test-smartcont)
+ton_test(test-net)
+ton_test(test-tdactor)
 
 #BEGIN tonlib
-add_test(test-tdutils test-tdutils)
-add_test(test-tonlib-offline test-tonlib-offline)
+ton_test(test-tdutils)
+ton_test(test-tonlib-offline)
 #END tonlib
 
 # FunC tests
@@ -657,15 +662,16 @@ endif()
 
 #BEGIN internal
 if (NOT TON_ONLY_TONLIB)
-add_test(test-adnl test-adnl)
-add_test(test-dht test-dht)
-add_test(test-rldp test-rldp)
-add_test(test-rldp2 test-rldp2)
-add_test(test-validator-session-state test-validator-session-state)
-add_test(test-catchain test-catchain)
-
-add_test(test-fec test-fec)
-add_test(test-tddb test-tddb ${TEST_OPTIONS})
-add_test(test-db test-db ${TEST_OPTIONS})
+ton_test(test-adnl)
+ton_test(test-dht)
+ton_test(test-rldp)
+ton_test(test-rldp2)
+ton_test(test-validator-session-state)
+ton_test(test-catchain)
+ton_test(test-emulator)
+
+ton_test(test-fec)
+ton_test(test-tddb ${TEST_OPTIONS})
+ton_test(test-db ${TEST_OPTIONS})
 endif()
 #END internal
diff --git a/assembly/native/build-macos-portable.sh b/assembly/native/build-macos-portable.sh
@@ -153,10 +153,7 @@ if [ "$with_tests" = true ]; then
   ninja storage-daemon storage-daemon-cli blockchain-explorer   \
   tonlib tonlibjson tonlib-cli validator-engine func tolk fift \
   lite-client validator-engine-console generate-random-id json2tlo dht-server dht-ping-servers dht-resolve \
-  http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator \
-  test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont \
-  test-net test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \
-  test-rldp2 test-catchain test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
+  http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator proxy-liteserver all-tests
   test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else
   ninja storage-daemon storage-daemon-cli blockchain-explorer   \
diff --git a/assembly/native/build-macos-shared.sh b/assembly/native/build-macos-shared.sh
@@ -91,10 +91,7 @@ if [ "$with_tests" = true ]; then
   ninja storage-daemon storage-daemon-cli blockchain-explorer   \
   tonlib tonlibjson tonlib-cli validator-engine func tolk fift \
   lite-client validator-engine-console generate-random-id json2tlo dht-server dht-ping-servers dht-resolve \
-  http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator \
-  test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont \
-  test-net test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp \
-  test-rldp2 test-catchain test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
+  http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork tlbc emulator proxy-liteserver all-tests
   test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else
   ninja storage-daemon storage-daemon-cli blockchain-explorer   \
diff --git a/assembly/native/build-ubuntu-appimages.sh b/assembly/native/build-ubuntu-appimages.sh
@@ -62,10 +62,7 @@ if [ "$with_tests" = true ]; then
 ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-cli \
       validator-engine lite-client validator-engine-console blockchain-explorer \
       generate-random-id json2tlo dht-server http-proxy rldp-http-proxy dht-ping-servers dht-resolve \
-      adnl-proxy create-state emulator test-ed25519 test-bigint \
-      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-coro test-tdutils \
-      test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \
-      test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
+      adnl-proxy create-state emulator proxy-liteserver all-tests
       test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else
 ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-cli \
diff --git a/assembly/native/build-ubuntu-portable.sh b/assembly/native/build-ubuntu-portable.sh
@@ -136,10 +136,7 @@ if [ "$with_tests" = true ]; then
 ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-cli \
       validator-engine lite-client validator-engine-console blockchain-explorer \
       generate-random-id json2tlo dht-server http-proxy rldp-http-proxy dht-ping-servers dht-resolve \
-      adnl-proxy create-state emulator test-ed25519 test-bigint \
-      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-coro test-tdutils \
-      test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \
-      test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
+      adnl-proxy create-state emulator proxy-liteserver all-tests
       test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else
 ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-cli \
diff --git a/assembly/native/build-ubuntu-shared.sh b/assembly/native/build-ubuntu-shared.sh
@@ -65,10 +65,7 @@ if [ "$with_tests" = true ]; then
 ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-cli \
       validator-engine lite-client validator-engine-console blockchain-explorer \
       generate-random-id json2tlo dht-server http-proxy rldp-http-proxy dht-ping-servers dht-resolve \
-      adnl-proxy create-state emulator test-ed25519 test-bigint \
-      test-vm test-fift test-cells test-smartcont test-net test-tdactor test-coro test-tdutils \
-      test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain \
-      test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
+      adnl-proxy create-state emulator proxy-liteserver all-tests
       test $? -eq 0 || { echo "Can't compile ton"; exit 1; }
 else
 ninja storage-daemon storage-daemon-cli fift func tolk tonlib tonlibjson tonlib-cli \
diff --git a/assembly/native/build-windows-2019.bat b/assembly/native/build-windows-2019.bat
@@ -147,9 +147,7 @@ IF "%1"=="-t" (
 ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tolk tonlib tonlibjson  ^
 tonlib-cli validator-engine lite-client validator-engine-console generate-random-id ^
 json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork emulator ^
-test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont test-net ^
-test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
-test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver dht-ping-servers dht-resolve
+proxy-liteserver dht-ping-servers dht-resolve all-tests
 IF %errorlevel% NEQ 0 (
   echo Can't compile TON
   exit /b %errorlevel%
diff --git a/assembly/native/build-windows-2022.bat b/assembly/native/build-windows-2022.bat
@@ -147,9 +147,7 @@ IF "%1"=="-t" (
 ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tolk tonlib tonlibjson  ^
 tonlib-cli validator-engine lite-client validator-engine-console generate-random-id ^
 json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork emulator ^
-test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont test-net ^
-test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
-test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver
+proxy-liteserver all-tests
 IF %errorlevel% NEQ 0 (
   echo Can't compile TON
   exit /b %errorlevel%
diff --git a/assembly/native/build-windows.bat b/assembly/native/build-windows.bat
@@ -147,9 +147,7 @@ IF "%1"=="-t" (
 ninja storage-daemon storage-daemon-cli blockchain-explorer fift func tolk tonlib tonlibjson  ^
 tonlib-cli validator-engine lite-client validator-engine-console generate-random-id ^
 json2tlo dht-server http-proxy rldp-http-proxy adnl-proxy create-state create-hardfork emulator ^
-test-ed25519 test-bigint test-vm test-fift test-cells test-smartcont test-net ^
-test-tdactor test-coro test-tdutils test-tonlib-offline test-adnl test-dht test-rldp test-rldp2 test-catchain ^
-test-fec test-tddb test-db test-validator-session-state test-emulator proxy-liteserver dht-ping-servers dht-resolve
+proxy-liteserver dht-ping-servers dht-resolve all-tests
 IF %errorlevel% NEQ 0 (
   echo Can't compile TON
   exit /b %errorlevel%
diff --git a/tdactor/test/CMakeLists.txt b/tdactor/test/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_executable(test-coro test-coro.cpp)
 target_link_libraries(test-coro tdactor tdutils)
 target_include_directories(test-coro PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../)
+
+ton_test(test-coro)
diff --git a/tdutils/td/utils/tests.cpp b/tdutils/td/utils/tests.cpp
@@ -16,6 +16,7 @@
 
     Copyright 2017-2020 Telegram Systems LLP
 */
+#include <iostream>
 #include <map>
 
 #include "td/utils/Parser.h"
@@ -173,6 +174,14 @@ void TestsRunner::set_stress_flag(bool flag) {
   stress_flag_ = flag;
 }
 
+void TestsRunner::set_pretty_output(bool flag) {
+  pretty_output_ = flag;
+}
+
+bool TestsRunner::use_pretty_output() const {
+  return pretty_output_;
+}
+
 void TestsRunner::run_all() {
   while (run_all_step()) {
   }
@@ -201,7 +210,11 @@ bool TestsRunner::run_all_step() {
         ++state_.it;
         continue;
       }
-      LOG(ERROR) << "Run test " << tag("name", name);
+      if (pretty_output_) {
+        std::cerr << "Running test " << name << "..." << std::endl;
+      } else {
+        LOG(ERROR) << "Run test " << tag("name", name);
+      }
       state_.start = Time::now();
       state_.start_unadjusted = Time::now_unadjusted();
       state_.is_running = true;
@@ -213,21 +226,46 @@ bool TestsRunner::run_all_step() {
 
     auto passed = Time::now() - state_.start;
     auto real_passed = Time::now_unadjusted() - state_.start_unadjusted;
-    if (real_passed + 1e-9 > passed) {
-      LOG(ERROR) << format::as_time(passed);
+    if (test_failed_) {
+      if (pretty_output_) {
+        std::cerr << "FAIL" << std::endl;
+        failed_tests_.push_back(name);
+      } else {
+        LOG(ERROR) << "FAILED in " << format::as_time(passed);
+      }
+      any_test_failed_ = true;
     } else {
-      LOG(ERROR) << format::as_time(passed) << " real[" << format::as_time(real_passed) << "]";
+      if (pretty_output_) {
+        std::cerr << "PASS in " << (PSTRING() << format::as_time(passed)) << std::endl;
+        ++passed_tests_;
+      } else if (real_passed + 1e-9 > passed) {
+        LOG(ERROR) << format::as_time(passed);
+      } else {
+        LOG(ERROR) << format::as_time(passed) << " real[" << format::as_time(real_passed) << "]";
+      }
     }
     if (regression_tester_) {
       regression_tester_->save_db();
     }
     state_.is_running = false;
+    test_failed_ = false;
     ++state_.it;
   }
 
   auto ret = state_.it != state_.end;
   if (!ret) {
+    if (pretty_output_) {
+      if (failed_tests_.empty()) {
+        std::cerr << passed_tests_ << " test(s) passed" << std::endl;
+      } else {
+        std::cerr << failed_tests_.size() << " test(s) failed:" << std::endl;
+        for (auto &failed_name : failed_tests_) {
+          std::cerr << " - " << failed_name << std::endl;
+        }
+      }
+    }
     state_ = State();
+    test_failed_ = false;
   }
   return ret || stress_flag_;
 }
@@ -246,4 +284,13 @@ Status TestsRunner::verify(Slice data) {
   return regression_tester_->verify_test(PSLICE() << name() << "_default", data);
 }
 
+void TestsRunner::register_test_failure() {
+  CHECK(state_.is_running);
+  test_failed_ = true;
+}
+
+bool TestsRunner::any_test_failed() const {
+  return any_test_failed_;
+}
+
 }  // namespace td
diff --git a/tdutils/td/utils/tests.h b/tdutils/td/utils/tests.h
diff --git a/test/test-td-main.cpp b/test/test-td-main.cpp
