Skip to content

Commit

Permalink
Now marshalling-zk also supports junit.
Browse files Browse the repository at this point in the history
  • Loading branch information
martun committed Dec 20, 2023
1 parent 8e467dd commit a4b20d3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/crypto3-testing-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,14 @@ jobs:
custom_tests_dir=$artifact_dir/ubuntu-22.04/${{ matrix.cpp_compiler }}/${{ matrix.build_type }}
mkdir -p $custom_tests_dir
targets_str=$(echo "${{ inputs.targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' '|' | sed 's/|$//')
ctest -v -j ${{ steps.strings.outputs.proc-number }} -R "(${targets_str})" || true
test_paths="${{ inputs.test-paths }}"
for dir in $(echo "${test_paths}" | awk 'NF {$1=$1; print}')
do
cd ${{ steps.strings.outputs.docker-workspace-path }}/build/$dir
targets_str=$(find . -type f -executable -printf '%P|' | sed 's/|$//')
ctest -v -j ${{ steps.strings.outputs.proc-number }} -R "(${targets_str})" || true
mkdir -p $custom_tests_dir/$dir
mv ./junit_results/* $custom_tests_dir/$dir
mv ${{ steps.strings.outputs.docker-workspace-path }}/build/$dir/junit_results/* $custom_tests_dir/$dir
done
mv ${{ steps.make-build-report.outputs.build-junit-report }} $custom_tests_dir
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/crypto3-testing-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,14 @@ jobs:
custom_tests_dir=$artifact_dir/macos-12/${{ matrix.cpp_compiler }}/${{ matrix.build_type }}
mkdir -p $custom_tests_dir
targets_str=$(echo "${{ inputs.targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' '|' | sed 's/|$//')
ctest -v -j ${{ steps.strings.outputs.proc-number }} -R "(${targets_str})" || true
test_paths="${{ inputs.test-paths }}"
for dir in $(echo "${test_paths}" | awk 'NF {$1=$1; print}')
do
cd ${{ github.workspace }}/build/$dir
# -perm +0111 checks for execute permission, we also need to remove the ./ in the start of executable names.
targets_str=$(find . -type f -perm +0111 | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' ' ' | sed 's/\.\///' | sed 's/ $//')
ctest -v -j ${{ steps.strings.outputs.proc-number }} -R "(${targets_str})" || true
mkdir -p $custom_tests_dir/$dir
mv ./junit_results/* $custom_tests_dir/$dir
mv ${{ steps.strings.outputs.docker-workspace-path }}/build/$dir/junit_results/* $custom_tests_dir/$dir
done
mv ${{ steps.make-build-report.outputs.build-junit-report }} $custom_tests_dir
Expand Down
2 changes: 1 addition & 1 deletion libs/marshalling/zk
Submodule zk updated 1 files
+13 −1 test/CMakeLists.txt

0 comments on commit a4b20d3

Please sign in to comment.