WIP 2

Change-Id: Id10cfa26828c22d9759399bee6c2f24def6e4318 Signed-off-by: Jan Matyas <[email protected]>
JanMatCodasip · Dec 30, 2020 · 13a467c · 13a467c
1 parent aa26699
commit 13a467c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git 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,20 +45,20 @@ 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.
         if: steps.collect_cov.outputs.exit_code == 0
         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 → tools/riscv-openocd-ci/.gitignore b/riscv-openocd-ci/.gitignore → tools/riscv-openocd-ci/.gitignore
diff --git a/riscv-openocd-ci/README.md → tools/riscv-openocd-ci/README.md b/riscv-openocd-ci/README.md → 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 → tools/riscv-openocd-ci/build_openocd.sh b/riscv-openocd-ci/build_openocd.sh → tools/riscv-openocd-ci/build_openocd.sh
diff --git a/riscv-openocd-ci/build_spike.sh → tools/riscv-openocd-ci/build_spike.sh b/riscv-openocd-ci/build_spike.sh → tools/riscv-openocd-ci/build_spike.sh
diff --git a/riscv-openocd-ci/download_toolchain.sh → tools/riscv-openocd-ci/download_toolchain.sh b/riscv-openocd-ci/download_toolchain.sh → tools/riscv-openocd-ci/download_toolchain.sh
diff --git a/...enocd-ci/patches/openocd_gcov_flush.patch → ...enocd-ci/patches/openocd_gcov_flush.patch b/...enocd-ci/patches/openocd_gcov_flush.patch → ...enocd-ci/patches/openocd_gcov_flush.patch
diff --git a/riscv-openocd-ci/process_test_results.py → .../riscv-openocd-ci/process_test_results.py b/riscv-openocd-ci/process_test_results.py → .../riscv-openocd-ci/process_test_results.py
diff --git a/riscv-openocd-ci/run_tests.sh → tools/riscv-openocd-ci/run_tests.sh b/riscv-openocd-ci/run_tests.sh → tools/riscv-openocd-ci/run_tests.sh