From 598ff9e490a512ff89a1d392fb21fd7f92195b3b Mon Sep 17 00:00:00 2001 From: Lukas Dullinger <129603980+itislu@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:06:42 +0200 Subject: [PATCH 1/2] ci: Adjust to new output filenames of tester --- .github/scripts/print_test_case.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/print_test_case.sh b/.github/scripts/print_test_case.sh index be951c34..82479948 100644 --- a/.github/scripts/print_test_case.sh +++ b/.github/scripts/print_test_case.sh @@ -10,8 +10,8 @@ output_file_path="${TESTER_OUTPUT_DIR}/${file_dirname}/${file_basename}" print_output() { local output_type=$1 - local file_minishell="${output_file_path}/${output_type}_minishell_${test_number}" - local file_bash="${output_file_path}/${output_type}_bash_${test_number}" + local file_minishell="${output_file_path}/${test_number}_${output_type}_minishell" + local file_bash="${output_file_path}/${test_number}_${output_type}_bash" # Print diff of output between bash and minishell if [[ -f $file_minishell && -f $file_bash ]]; then @@ -42,7 +42,7 @@ print_output() print_valgrind_output() { - local file_valgrind="${output_file_path}/valgrind_out_${test_number}" + local file_valgrind="${output_file_path}/${test_number}_valgrind_out" # Print valgrind output if [[ -f $file_valgrind ]]; then From 1c554740463e013c58ed8e483a801748585223e8 Mon Sep 17 00:00:00 2001 From: Lukas Dullinger <129603980+itislu@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:08:25 +0200 Subject: [PATCH 2/2] ci: Call tester with new `--no-update` flag --- .github/workflows/regression_test.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/regression_test.yaml b/.github/workflows/regression_test.yaml index f9296c43..1a54b63b 100644 --- a/.github/workflows/regression_test.yaml +++ b/.github/workflows/regression_test.yaml @@ -45,7 +45,7 @@ jobs: - name: 🌱 Test source branch of pull request run: | make re CC=clang-12 - ${{ env.TESTER_DIR }}/tester.sh ${{ inputs.test_mode }} > ${{ env.HOME }}/source_test_result.txt + ${{ env.TESTER_DIR }}/tester.sh --no-update ${{ inputs.test_mode }} > ${{ env.HOME }}/source_test_result.txt env: GH_BRANCH: SOURCE_FAILED_COUNT @@ -66,7 +66,7 @@ jobs: - name: 🎯 Test target branch of pull request run: | make re CC=clang-12 - ${{ env.TESTER_DIR }}/tester.sh ${{ inputs.test_mode }} > ${{ env.HOME }}/target_test_result.txt + ${{ env.TESTER_DIR }}/tester.sh --no-update ${{ inputs.test_mode }} > ${{ env.HOME }}/target_test_result.txt env: GH_BRANCH: TARGET_FAILED_COUNT diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9f7dd13f..bb171386 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -79,7 +79,7 @@ jobs: - name: 🔍 Check memory leaks run: | make re CC=clang-12 - ${{ env.TESTER_DIR }}/tester.sh va > ${{ env.HOME }}/leak_result.txt + ${{ env.TESTER_DIR }}/tester.sh --no-update va > ${{ env.HOME }}/leak_result.txt env: GH_BRANCH: IGNORE continue-on-error: true