diff --git a/.gitignore b/.gitignore index ed7ed2e..69a15ec 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,8 @@ docs/ .env .env.test -lcov.info +lcov.info* +report/ .DS_Store *.tree diff --git a/Makefile b/Makefile index 2cf2ab1..ee71e33 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ deploy-prodnet: export ETHERSCAN_API_KEY_PARAM = --etherscan-api-key $(ETHERSCAN # CONSTANTS -TEST_COVERAGE_SRC_FILES:=$(wildcard test/*.sol test/**/*.sol script/*.sol script/**/*.sol src/escrow/increasing/delegation/*.sol src/libs/ProxyLib.sol) +TEST_COVERAGE_SRC_FILES:=$(wildcard test/*.sol test/**/*.sol src/*.sol src/**/*.sol src/libs/ProxyLib.sol) DEPLOY_SCRIPT:=script/Deploy.s.sol:Deploy VERBOSITY:=-vvv SHELL:=/bin/bash @@ -68,10 +68,11 @@ report/index.html: lcov.info.pruned genhtml $^ -o report --branch-coverage lcov.info.pruned: lcov.info - lcov --remove ./$< -o ./$@ $^ + lcov --remove $< -o ./$@ $^ lcov.info: $(TEST_COVERAGE_SRC_FILES) - forge coverage --no-match-path $(FORK_TEST_WILDCARD) --report lcov + forge coverage --report lcov +# forge coverage --no-match-path $(FORK_TEST_WILDCARD) --report lcov : ## diff --git a/README.md b/README.md index 2e85638..a245a87 100644 --- a/README.md +++ b/README.md @@ -448,14 +448,12 @@ Then use `make` to automatically sync the described branches into solidity test ```sh $ make Available targets: -- make all Builds all tree files and updates the test tree markdown -- make sync Scaffold or sync tree files into solidity tests -- make check Checks if solidity files are out of sync -- make markdown Generates a markdown file with the test definitions rendered as a tree -- make init Check the dependencies and prompt to install if needed -- make clean Clean the intermediary tree files +# ... +- make sync-tests Scaffold or sync tree files into solidity tests +- make check-tests Checks if solidity files are out of sync +- make markdown-tests Generates a markdown file with the test definitions rendered as a tree -$ make sync +$ make sync-tests ``` The final output will look like a human readable tree: