From 13a467c7144fcec9a204972eac53f063536b6075 Mon Sep 17 00:00:00 2001 From: Jan Matyas Date: Wed, 30 Dec 2020 13:23:43 +0100 Subject: [PATCH] WIP 2 Change-Id: Id10cfa26828c22d9759399bee6c2f24def6e4318 Signed-off-by: Jan Matyas --- .github/workflows/riscv-openocd-ci.yml | 22 +++++++++---------- .../riscv-openocd-ci}/.gitignore | 0 .../riscv-openocd-ci}/README.md | 2 +- .../riscv-openocd-ci}/build_openocd.sh | 0 .../riscv-openocd-ci}/build_spike.sh | 0 .../riscv-openocd-ci}/download_toolchain.sh | 0 .../patches/openocd_gcov_flush.patch | 0 .../riscv-openocd-ci}/process_test_results.py | 0 .../riscv-openocd-ci}/run_tests.sh | 0 9 files changed, 12 insertions(+), 12 deletions(-) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/.gitignore (100%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/README.md (89%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/build_openocd.sh (100%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/build_spike.sh (100%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/download_toolchain.sh (100%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/patches/openocd_gcov_flush.patch (100%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/process_test_results.py (100%) rename {riscv-openocd-ci => tools/riscv-openocd-ci}/run_tests.sh (100%) diff --git a/.github/workflows/riscv-openocd-ci.yml b/.github/workflows/riscv-openocd-ci.yml index e9c1c7e7d9..b31b333dc8 100644 --- a/.github/workflows/riscv-openocd-ci.yml +++ b/.github/workflows/riscv-openocd-ci.yml @@ -16,27 +16,27 @@ jobs: uses: actions/checkout@v2 - name: Build OpenOCD - run: bash riscv-openocd-ci/build_openocd.sh + run: bash tools/riscv-openocd-ci/build_openocd.sh - name: Checkout & build Spike - run: bash riscv-openocd-ci/build_spike.sh + run: bash tools/riscv-openocd-ci/build_spike.sh - name: Download RISC-V toolchain - run: bash riscv-openocd-ci/download_toolchain.sh + run: bash tools/riscv-openocd-ci/download_toolchain.sh - name: Update env. variables # Change RISCV and PATH env variables for subsequent steps. run: | - echo "`pwd`/riscv-openocd-ci/work/install/bin" >> $GITHUB_PATH - echo "RISCV=`pwd`/riscv-openocd-ci/work/install" >> $GITHUB_ENV + echo "`pwd`/tools/riscv-openocd-ci/work/install/bin" >> $GITHUB_PATH + echo "RISCV=`pwd`/tools/riscv-openocd-ci/work/install" >> $GITHUB_ENV - name: Checkout & run riscv-tests id: run_tests - run: bash riscv-openocd-ci/run_tests.sh + run: bash tools/riscv-openocd-ci/run_tests.sh - name: Process test results run: | - cd riscv-openocd-ci + cd tools/riscv-openocd-ci python3 process_test_results.py --log-dir work/riscv-tests/debug/logs --output-dir work/results/logs - name: Store test results @@ -45,15 +45,15 @@ jobs: uses: actions/upload-artifact@v2 with: name: test-results - path: riscv-openocd-ci/work/results/logs + path: tools/riscv-openocd-ci/work/results/logs - name: Collect OpenOCD code coverage id: collect_cov # Run if tests were executed. if: steps.run_tests.outputs.exit_code == 0 run: | - lcov --capture --directory . --output-file riscv-openocd-ci/work/openocd-coverage.info - genhtml riscv-openocd-ci/work/openocd-coverage.info --output-directory riscv-openocd-ci/work/results/openocd-coverage + lcov --capture --directory . --output-file tools/riscv-openocd-ci/work/openocd-coverage.info + genhtml tools/riscv-openocd-ci/work/openocd-coverage.info --output-directory tools/riscv-openocd-ci/work/results/openocd-coverage - name: Store OpenOCD code coverage # Run if coverage was collected. @@ -61,4 +61,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: openocd-coverage - path: riscv-openocd-ci/work/results/openocd-coverage + path: tools/riscv-openocd-ci/work/results/openocd-coverage diff --git a/riscv-openocd-ci/.gitignore b/tools/riscv-openocd-ci/.gitignore similarity index 100% rename from riscv-openocd-ci/.gitignore rename to tools/riscv-openocd-ci/.gitignore diff --git a/riscv-openocd-ci/README.md b/tools/riscv-openocd-ci/README.md similarity index 89% rename from riscv-openocd-ci/README.md rename to tools/riscv-openocd-ci/README.md index 88c114e67d..ef7e28831c 100644 --- a/riscv-openocd-ci/README.md +++ b/tools/riscv-openocd-ci/README.md @@ -17,5 +17,5 @@ The scripts perform these actions: - Process the test results - Collect code coverage for OpenOCD -See [.github/workflows](../.github/workflows) for an example of how this is +See [.github/workflows](../../.github/workflows) for an example of how this is used in practice. diff --git a/riscv-openocd-ci/build_openocd.sh b/tools/riscv-openocd-ci/build_openocd.sh similarity index 100% rename from riscv-openocd-ci/build_openocd.sh rename to tools/riscv-openocd-ci/build_openocd.sh diff --git a/riscv-openocd-ci/build_spike.sh b/tools/riscv-openocd-ci/build_spike.sh similarity index 100% rename from riscv-openocd-ci/build_spike.sh rename to tools/riscv-openocd-ci/build_spike.sh diff --git a/riscv-openocd-ci/download_toolchain.sh b/tools/riscv-openocd-ci/download_toolchain.sh similarity index 100% rename from riscv-openocd-ci/download_toolchain.sh rename to tools/riscv-openocd-ci/download_toolchain.sh diff --git a/riscv-openocd-ci/patches/openocd_gcov_flush.patch b/tools/riscv-openocd-ci/patches/openocd_gcov_flush.patch similarity index 100% rename from riscv-openocd-ci/patches/openocd_gcov_flush.patch rename to tools/riscv-openocd-ci/patches/openocd_gcov_flush.patch diff --git a/riscv-openocd-ci/process_test_results.py b/tools/riscv-openocd-ci/process_test_results.py similarity index 100% rename from riscv-openocd-ci/process_test_results.py rename to tools/riscv-openocd-ci/process_test_results.py diff --git a/riscv-openocd-ci/run_tests.sh b/tools/riscv-openocd-ci/run_tests.sh similarity index 100% rename from riscv-openocd-ci/run_tests.sh rename to tools/riscv-openocd-ci/run_tests.sh