Merge pull request #490 from Levak/levak/tests-parallel

Run tests in parallel or only some with a filter

.github/workflows/linux-ci.yml

@@ -13,8 +13,8 @@ jobs:
         run: |
           mkdir build && cd build
           cmake -DCMAKE_BUILD_TYPE=Debug ..
-          make -j2
+          make -j4
       - name: Test
         run: |
           cd build
-          make check
+          make check JOBS=4

.github/workflows/msvc-ci.yml

@@ -26,6 +26,7 @@ jobs:
           bash.exe ..\..\tests\all_tests.sh
         env:
           PYTHON_EXE: python.exe
+          JOBS: 4
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

.gitignore

@@ -5,3 +5,4 @@
 *.kdev4
 /.kdev4
 __pycache__
+tests-out

README.markdown

@@ -26,7 +26,8 @@ https://github.com/zrax/pycdc
 * Build the generated project or makefile
   * For projects (e.g. MSVC), open the generated project file and build it
   * For makefiles, just run `make`
-  * To run tests (on \*nix or MSYS), run `make check`
+  * To run tests (on \*nix or MSYS), run `make check JOBS=4` (optional
+    `FILTER=xxxx` to run only certain tests)
 
 ## Usage
 **To run pycdas**, the PYC Disassembler:

tests/all_tests.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
+set -e
 
 srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
+jobs=${JOBS:-4}
+filter=${FILTER:-""}
 
-test_status=0
-test_files=( "$srcdir"/tests/tokenized/*.txt )
-for tf in "${test_files[@]}"; do
-    test_name="$(basename "$tf")"
-    test_name="${test_name%.txt}"
-    "$srcdir"/tests/decompyle_test.sh $test_name tests || test_status=1
-done
-
-exit $test_status
+find "${srcdir}/tests/tokenized" -type f -name '*.txt' -a -name "*${filter}*" -print0 | \
+    xargs -0 -I '{}' -P $jobs \
+          bash -c 'o=$('"$srcdir"'/tests/decompyle_test.sh "$(basename -s .txt "{}")" tests-out) r=$?; echo "$o"; exit $r'