From a5fe3443b8f921ad1c6b0461f057ecec5160bd45 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 3 May 2023 16:31:07 +0200 Subject: [PATCH 1/5] reset skip flag on every new file --- scripts/prepare_mem_dryrun.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/prepare_mem_dryrun.py b/scripts/prepare_mem_dryrun.py index b83018e468..20da546c19 100755 --- a/scripts/prepare_mem_dryrun.py +++ b/scripts/prepare_mem_dryrun.py @@ -16,6 +16,7 @@ for d in dirs: with open(fileIn, 'r') as f_in: lines = f_in.readlines() with open(fileIn, 'w') as f_out: + skip = 0 for line in lines: if re.search(r'#define\W+WMC_TOOL_SKIP', line): skip = 1 -- GitLab From 5cc060559c65ef1f8e42069e9b384266dbb9d2cf Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 3 May 2023 16:32:16 +0200 Subject: [PATCH 2/5] force fhg runner 1 on smoke test to see if actually fixed --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ce29dfd65..ac785a6541 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -314,6 +314,8 @@ codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request + tags: + - test-fhg-linux-runner1 timeout: "5 minutes" stage: test needs: ["build-codec-linux-cmake"] -- GitLab From d5a9189606a6b883c21fa40431af1ecb7ec9db76 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 3 May 2023 16:41:10 +0200 Subject: [PATCH 3/5] Revert "force fhg runner 1 on smoke test to see if actually fixed" This reverts commit 5cc060559c65ef1f8e42069e9b384266dbb9d2cf. --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac785a6541..7ce29dfd65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -314,8 +314,6 @@ codec-smoke-test: extends: - .test-job-linux-needs-testv-dir - .rules-merge-request - tags: - - test-fhg-linux-runner1 timeout: "5 minutes" stage: test needs: ["build-codec-linux-cmake"] -- GitLab From ae3a65e04374b5f595e979e4a4033078366b96d4 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 3 May 2023 16:54:36 +0200 Subject: [PATCH 4/5] add undef WMC_TOOL_SKIP --- lib_com/disclaimer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib_com/disclaimer.c b/lib_com/disclaimer.c index ed55a45b06..19d125900a 100644 --- a/lib_com/disclaimer.c +++ b/lib_com/disclaimer.c @@ -55,3 +55,6 @@ int16_t print_disclaimer( FILE *fPtr ) return 0; } + +#undef WMC_TOOL_SKIP + -- GitLab From 8259a55e370235e977d49d1e1616d3305a37acba Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 3 May 2023 17:03:57 +0200 Subject: [PATCH 5/5] apply clang format --- lib_com/disclaimer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/disclaimer.c b/lib_com/disclaimer.c index 19d125900a..10a31d94c0 100644 --- a/lib_com/disclaimer.c +++ b/lib_com/disclaimer.c @@ -57,4 +57,3 @@ int16_t print_disclaimer( FILE *fPtr ) } #undef WMC_TOOL_SKIP - -- GitLab