moved some stuff from tools to more appropriate locations (danmar#7450)

Author: firewave

.github/workflows/CI-unixish-docker.yml

@@ -127,7 +127,7 @@ jobs:
       # requires python3
       - name: Run extra tests
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
       # requires which
       - name: Validate

.github/workflows/CI-unixish.yml

@@ -311,7 +311,7 @@ jobs:
       # requires "gnu-sed" installed on macos
       - name: Run extra tests
         run: |
-          tools/generate_and_run_more_tests.sh
+          test/scripts/generate_and_run_more_tests.sh
 
       - name: Run test/cli
         run: |

.github/workflows/scriptcheck.yml

@@ -132,7 +132,9 @@ jobs:
 
       - name: test matchcompiler
         run: |
-          python tools/test_matchcompiler.py
+          python test/tools/test_matchcompiler.py
+        env:
+          PYTHONPATH: ./tools
 
       # TODO: run with "-n auto" when misra_test.py can be run in parallel
       # we cannot specify -Werror since xml/etree/ElementTree.py in Python 3.9/3.10 contains an unclosed file
@@ -169,21 +171,21 @@ jobs:
 
       - name: test reduce
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/reduce_test.py
+          python -m pytest -Werror --strict-markers -vv test/tools/reduce_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_lib
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/donate_cpu_lib_test.py
+          python -m pytest -Werror --strict-markers -vv test/tools/donate_cpu_lib_test.py
         env:
           PYTHONPATH: ./tools
 
       - name: test donate_cpu_server
         run: |
-          python -m pytest -Werror --strict-markers -vv tools/donate_cpu_server_test.py
+          python -m pytest -Werror --strict-markers -vv test/tools/donate_cpu_server_test.py
           # TODO: why is this file generated? also should be in a temporary folder if possible
-          rm -f tools/donate-cpu-server.log
+          rm -f test/tools/donate-cpu-server.log
         env:
           PYTHONPATH: ./tools
 

tools/extract_and_run_more_tests.sh …st/scripts/extract_and_run_more_tests.shtools/extract_and_run_more_tests.sh renamed to test/scripts/extract_and_run_more_tests.sh tools/extract_and_run_more_tests.sh renamed to test/scripts/extract_and_run_more_tests.sh

@@ -4,5 +4,5 @@ cd ~/cppcheck || exit 1
 rm -rf test1
 python tools/extracttests.py --code=test1 test/testleakautovar.cpp
 cd ~/cppcheck/test1 || exit 1
-~/cppcheck/tools/run_more_tests.sh
+~/cppcheck/test/scripts/run_more_tests.sh
 

tools/extracttests.py test/scripts/extracttests.pytools/extracttests.py renamed to test/scripts/extracttests.py

@@ -8,14 +8,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 set -e
 
 echo testleakautovar
-$DIR/run_more_tests.sh $DIR/../test/testleakautovar.cpp
+$DIR/run_more_tests.sh $DIR/../testleakautovar.cpp
 
 echo testmemleak
-$DIR/run_more_tests.sh $DIR/../test/testmemleak.cpp
+$DIR/run_more_tests.sh $DIR/../testmemleak.cpp
 
 echo testnullpointer
-$DIR/run_more_tests.sh $DIR/../test/testnullpointer.cpp
+$DIR/run_more_tests.sh $DIR/../testnullpointer.cpp
 
 echo testuninitvar
-$DIR/run_more_tests.sh $DIR/../test/testuninitvar.cpp
+$DIR/run_more_tests.sh $DIR/../testuninitvar.cpp