From 3f65f70a5617297af623e8f03b4f3d5364eae244 Mon Sep 17 00:00:00 2001
From: tuturu-tech <elvis.skozdopolj@trailofbits.com>
Date: Tue, 26 Mar 2024 17:15:27 +0100
Subject: [PATCH] update make test, update pytest workflow

---
 .github/workflows/pytest.yml | 6 ------
 Makefile                     | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 6e545f2..81a8c54 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -41,12 +41,6 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
-      
-      - name: Install Foundry dependencies
-        run: forge install crytic/properties --no-commit
-      
-      - name: Set remappings
-        run: forge remappings > remappings.txt
 
       - name: Run tests
         run: |
diff --git a/Makefile b/Makefile
index c776d76..fadabc9 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,10 @@ reformat:
 test tests: $(VENV)/pyvenv.cfg
 	. $(VENV_BIN)/activate && \
 		solc-select use 0.8.19 --always-install && \
-		pytest $(T) $(TEST_ARGS)
+		cd tests/test_data && \
+		forge install && \
+		cd ../.. && \
+		pytest --ignore tests/test_data/lib $(T) $(TEST_ARGS)
 
 .PHONY: package
 package: $(VENV)/pyvenv.cfg