From e6cd7981d74d059d0b69a4d1cd710ab8b1de7f4f Mon Sep 17 00:00:00 2001
From: lorban <lorenzo.bonax@gmail.com>
Date: Mon, 13 May 2024 13:57:08 +0200
Subject: [PATCH] last fixies

add coverage repost MG action job and fix message-generator.sh
test interop-jdc-change-upstream.json excluded from MG action jobs
---
 .github/workflows/coverage.yaml | 18 ++++++------------
 llvm-cov-clean.sh               |  2 ++
 message-generator-tests.sh      | 14 +++++++++++++-
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100755 llvm-cov-clean.sh

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 4c04943c29..4bc9432694 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -70,6 +70,9 @@ jobs:
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
 
+      - name: Clean llvm-cov
+        run: sh ./llvm-cov-clean.sh
+
       - name: Run bad-pool-config-test
         run: sh ./test/message-generator/test/bad-pool-config-test/bad-pool-config-test.sh
 
@@ -110,19 +113,10 @@ jobs:
         run: sh ./test/message-generator/test/pool-sri-test-reject-auth/pool-sri-test-reject-auth.sh
 
       - name: Run standard-coverage
-        run: sh ./test/message-generator/test/standard-coverage-test/standard-coverage-test.sh
-
-      - name: Run sv1-test
-        run: sh ./test/message-generator/test/sv1-test/sv1-test.sh
-
-      - name: Run translation-proxy
-        run: sh ./test/message-generator/test/translation-proxy/translation-proxy.sh
+        run: sh ./test/message-generator/test/standard-coverage-test/standard-coverage-test.json
 
-      - name: Run translation-proxy-broke-pool
-        run: sh ./test/message-generator/test/translation-proxy-broke-pool/translation-proxy-broke-pool.sh
-
-      - name: Coverage report 
-        run: sh ./code-coverage-report.sh 
+      - name: Run standard-coverage
+        run: sh ./test/message-generator/test/standard-coverage-test/standard-coverage-test.json
 
       - name: Archive MG code coverage results
         uses: actions/upload-artifact@v4
diff --git a/llvm-cov-clean.sh b/llvm-cov-clean.sh
new file mode 100755
index 0000000000..365ac973d1
--- /dev/null
+++ b/llvm-cov-clean.sh
@@ -0,0 +1,2 @@
+cd roles
+cargo llvm-cov clean
diff --git a/message-generator-tests.sh b/message-generator-tests.sh
index 0b8e1db4ce..41d9f17301 100755
--- a/message-generator-tests.sh
+++ b/message-generator-tests.sh
@@ -1,4 +1,16 @@
 #! /bin/sh
-#
+
+search_dir="test/message-generator/test/"
+
+for entry in `ls $search_dir`; do
+    if [ "$entry" = "interop-jdc-change-upstream" ]; then
+        echo "Skipping $entry"
+        continue
+    fi
+
+    echo $entry
+    $search_dir$entry/$entry.sh 
+done
+
 cd roles
 RUST_LOG=debug cargo llvm-cov --ignore-filename-regex "utils/message-generator/|experimental/|protocols/" --cobertura --output-path "target/mg_coverage.xml" report