From 4c6d3aee2b169190cdc575cfa61a660967778e0f Mon Sep 17 00:00:00 2001
From: alpharush <0xalpharush@protonmail.com>
Date: Mon, 20 Mar 2023 23:36:08 -0500
Subject: [PATCH] fix script paths

---
 scripts/ci_test_cli.sh                                      | 6 +++---
 scripts/ci_test_erc.sh                                      | 2 +-
 scripts/ci_test_printers.sh                                 | 2 +-
 tests/e2e/compilation/test_resolution.py                    | 2 +-
 .../config/{config => test_json_config}/slither.config.json | 0
 tests/e2e/config/{config => test_json_config}/test.sol      | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/e2e/config/{config => test_json_config}/slither.config.json (100%)
 rename tests/e2e/config/{config => test_json_config}/test.sol (100%)

diff --git a/scripts/ci_test_cli.sh b/scripts/ci_test_cli.sh
index e35bf3ff5..08d9de836 100755
--- a/scripts/ci_test_cli.sh
+++ b/scripts/ci_test_cli.sh
@@ -4,17 +4,17 @@
 
 solc-select use 0.7.0
 
-if ! slither "tests/config/test.sol" --solc-ast --no-fail-pedantic; then
+if ! slither "tests/e2e/config/test_json_config/test.sol" --solc-ast --no-fail-pedantic; then
     echo "--solc-ast failed"
     exit 1
 fi
 
-if ! slither "tests/config/test.sol" --solc-disable-warnings --no-fail-pedantic; then
+if ! slither "tests/e2e/config/test_json_config/test.sol" --solc-disable-warnings --no-fail-pedantic; then
     echo "--solc-disable-warnings failed"
     exit 1
 fi
 
-if ! slither "tests/config/test.sol" --disable-color --no-fail-pedantic; then
+if ! slither "tests/e2e/config/test_json_config/test.sol" --disable-color --no-fail-pedantic; then
     echo "--disable-color failed"
     exit 1
 fi
diff --git a/scripts/ci_test_erc.sh b/scripts/ci_test_erc.sh
index ce9a62363..ebc59475a 100755
--- a/scripts/ci_test_erc.sh
+++ b/scripts/ci_test_erc.sh
@@ -2,7 +2,7 @@
 
 ### Test slither-check-erc
 
-DIR_TESTS="tests/check-erc"
+DIR_TESTS="tests/tools/check-erc"
 
 solc-select use 0.5.0
 slither-check-erc "$DIR_TESTS/erc20.sol" ERC20 > test_1.txt 2>&1
diff --git a/scripts/ci_test_printers.sh b/scripts/ci_test_printers.sh
index f6eaf0fc8..61994b337 100755
--- a/scripts/ci_test_printers.sh
+++ b/scripts/ci_test_printers.sh
@@ -2,7 +2,7 @@
 
 ### Test printer 
 
-cd tests/ast-parsing/compile || exit
+cd tests/e2e/solc_parsing/test_data/compile/ || exit
 
 # Do not test the evm printer,as it needs a refactoring
 ALL_PRINTERS="cfg,constructor-calls,contract-summary,data-dependency,echidna,function-id,function-summary,modifiers,call-graph,human-summary,inheritance,inheritance-graph,slithir,slithir-ssa,vars-and-auth,require,variable-order,declaration"
diff --git a/tests/e2e/compilation/test_resolution.py b/tests/e2e/compilation/test_resolution.py
index 738887045..4b50b0737 100644
--- a/tests/e2e/compilation/test_resolution.py
+++ b/tests/e2e/compilation/test_resolution.py
@@ -20,7 +20,7 @@ def test_node_modules() -> None:
     # hardhat must have been installed in tests/test_node_modules
     # For the CI its done through the github action config
 
-    slither = Slither(TEST_DATA_DIR, "test_node_modules")
+    slither = Slither(Path(TEST_DATA_DIR, "test_node_modules").as_posix())
     _run_all_detectors(slither)
 
 
diff --git a/tests/e2e/config/config/slither.config.json b/tests/e2e/config/test_json_config/slither.config.json
similarity index 100%
rename from tests/e2e/config/config/slither.config.json
rename to tests/e2e/config/test_json_config/slither.config.json
diff --git a/tests/e2e/config/config/test.sol b/tests/e2e/config/test_json_config/test.sol
similarity index 100%
rename from tests/e2e/config/config/test.sol
rename to tests/e2e/config/test_json_config/test.sol