From cef6856f154edac81fda08c38ebf30de86dbd4f8 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Tue, 11 Apr 2023 16:26:15 -0700 Subject: [PATCH] rename test binary --- .github/workflows/build-unit-tests.yaml | 4 ++-- .github/workflows/gen-configs.yaml | 2 +- .vscode/launch.json | 4 ++-- firmware/controllers/algo/engine_types.h | 2 +- firmware/gen_trigger_images.bat | 8 ++++---- unit_tests/jenkins.sh | 4 ++-- unit_tests/readme.md | 4 ++-- unit_tests/run_clean_gcov.sh | 2 +- unit_tests/run_sharded_tests.sh | 4 ++-- unit_tests/unit_test_rules.mk | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml index a6accc0354..d00ea67a75 100644 --- a/.github/workflows/build-unit-tests.yaml +++ b/.github/workflows/build-unit-tests.yaml @@ -47,7 +47,7 @@ jobs: - name: Run Tests working-directory: ./unit_tests/ - run: ASAN_OPTIONS=detect_stack_use_after_return=1 build/rusefi_test + run: ASAN_OPTIONS=detect_stack_use_after_return=1 build/fome_test - name: Set FTP variables env: @@ -79,4 +79,4 @@ jobs: - name: Run Tests (Valgrind) if: ${{ matrix.os != 'macos-latest' }} working-directory: ./unit_tests/ - run: valgrind --error-exitcode=1 --exit-on-first-error=yes --leak-check=no --show-error-list=yes build/rusefi_test + run: valgrind --error-exitcode=1 --exit-on-first-error=yes --leak-check=no --show-error-list=yes build/fome_test diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml index eedc560beb..1e051eb183 100644 --- a/.github/workflows/gen-configs.yaml +++ b/.github/workflows/gen-configs.yaml @@ -102,7 +102,7 @@ jobs: # - name: Run Tests # working-directory: ./unit_tests/ - # run: ASAN_OPTIONS=detect_stack_use_after_return=1 build/rusefi_test + # run: ASAN_OPTIONS=detect_stack_use_after_return=1 build/fome_test # # Commit changes and catch the error that occurs if nothing has been changed (without catching other errors) # - name: Commit fresh triggers.txt diff --git a/.vscode/launch.json b/.vscode/launch.json index 7635a08afc..2d6f2d5a13 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Debug Unit Tests (gdb)", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/unit_tests/build/rusefi_test", + "program": "${workspaceFolder}/unit_tests/build/fome_test", // uncomment args below to only debug a particular test //"args": ["--gtest_filter=etb.testTargetTpsIsFloatBug945"], "stopAtEntry": false, @@ -46,7 +46,7 @@ "name": "Debug Unit Tests (lldb)", "type": "lldb", "request": "launch", - "program": "${workspaceFolder}/unit_tests/build/rusefi_test", + "program": "${workspaceFolder}/unit_tests/build/fome_test", "args": [], "cwd": "${workspaceFolder}/unit_tests/build/", }, diff --git a/firmware/controllers/algo/engine_types.h b/firmware/controllers/algo/engine_types.h index 65765f3eb8..a05740a909 100644 --- a/firmware/controllers/algo/engine_types.h +++ b/firmware/controllers/algo/engine_types.h @@ -506,7 +506,7 @@ typedef enum { // do not forget to invoke "gen_config.bat" once you make changes to integration/rusefi_config.txt // todo: one day a hero would integrate some of these things into Makefile in order to reduce manual magic // - // Another point: once you add a new trigger, run get_trigger_images.bat which would run rusefi_test.exe from unit_tests + // Another point: once you add a new trigger, run get_trigger_images.bat which would run fome_test.exe from unit_tests // TT_UNUSED = 75, // this is used if we want to iterate over all trigger types diff --git a/firmware/gen_trigger_images.bat b/firmware/gen_trigger_images.bat index 004e2e9695..c72b73a516 100644 --- a/firmware/gen_trigger_images.bat +++ b/firmware/gen_trigger_images.bat @@ -4,15 +4,15 @@ rem and later manually published at https://rusefi.com/images/triggers/ cd ../unit_tests make -j4 -if not exist build/rusefi_test.exe echo UNIT TEST COMPILATION FAILED -if not exist build/rusefi_test.exe exit -1 +if not exist build/fome_test.exe echo UNIT TEST COMPILATION FAILED +if not exist build/fome_test.exe exit -1 rem This is me using Cygwin on all my Windows devices -ls -l build/rusefi_test.exe +ls -l build/fome_test.exe del triggers.txt -build\rusefi_test.exe +build\fome_test.exe pwd if not exist triggers.txt echo triggers.txt generation FAILED diff --git a/unit_tests/jenkins.sh b/unit_tests/jenkins.sh index 000f162556..19bafd8343 100644 --- a/unit_tests/jenkins.sh +++ b/unit_tests/jenkins.sh @@ -21,7 +21,7 @@ rm -fR .dep rm -fR build make - if [ ! -f build/rusefi_test ]; then + if [ ! -f build/fome_test ]; then echo "test compilation failed" exit -1 fi @@ -30,7 +30,7 @@ set -e # invoke the tests - hopefully error code would be propagated? - build/rusefi_test + build/fome_test cd "${WORKSPACE}/java_console" echo "CD to ${PWD}" diff --git a/unit_tests/readme.md b/unit_tests/readme.md index aad39d4fd0..fc1ce380cb 100644 --- a/unit_tests/readme.md +++ b/unit_tests/readme.md @@ -1,8 +1,8 @@ TL, DR: just follow [tests](tests) folder as examples. 1. Run 'make' to build desktop binary. -1. Execute rusefi_test binary on your PC/Mac, it's expected to say SUCCESS and not fail :) Googletest will also print results summary. -1. To run only one test uncomment and modify [main.cpp](https://github.com/rusefi/rusefi/blob/master/unit_tests/main.cpp) line ``::testing::GTEST_FLAG(filter)`` +1. Execute fome_test binary on your PC/Mac, it's expected to say SUCCESS and not fail :) Googletest will also print results summary. +1. To run only one test, run like this: `build/fome_test --gtest_filter=MyTestName` In this folder we have rusEFI unit tests using https://github.com/google/googletest diff --git a/unit_tests/run_clean_gcov.sh b/unit_tests/run_clean_gcov.sh index d19bf4b42e..91c281c2c9 100644 --- a/unit_tests/run_clean_gcov.sh +++ b/unit_tests/run_clean_gcov.sh @@ -2,5 +2,5 @@ make clean make -j6 -build/rusefi_test +build/fome_test bash ci_gcov.sh "$RUSEFI_DOXYGEN_FTP_USER" "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" diff --git a/unit_tests/run_sharded_tests.sh b/unit_tests/run_sharded_tests.sh index ec95cba0b0..cfccf9a2f6 100755 --- a/unit_tests/run_sharded_tests.sh +++ b/unit_tests/run_sharded_tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -# This script runs every test in its own process (own invocation of rusefi_test executable) +# This script runs every test in its own process (own invocation of fome_test executable) # This allows us to test for accidental cross-test leakage that fixes/breaks something set -e @@ -9,7 +9,7 @@ export GTEST_TOTAL_SHARDS=600 for IDX in {0..599} do export GTEST_SHARD_INDEX=$IDX - build/rusefi_test + build/fome_test done unset GTEST_TOTAL_SHARDS diff --git a/unit_tests/unit_test_rules.mk b/unit_tests/unit_test_rules.mk index ce1fceb4f8..22b56b7f9d 100644 --- a/unit_tests/unit_test_rules.mk +++ b/unit_tests/unit_test_rules.mk @@ -205,7 +205,7 @@ endif ############################################################################## # Define project name here -PROJECT = rusefi_test +PROJECT = fome_test ifeq ("$(wildcard $(UNIT_TESTS_DIR)/googletest/LICENSE)","") $(info Invoking "git submodule update --init")