From 5938dd53767066de4ef70a196f2a0cec36e12700 Mon Sep 17 00:00:00 2001
From: Andrei Kashin <kashin.andrej@gmail.com>
Date: Fri, 1 Dec 2023 11:49:36 +0000
Subject: [PATCH] Add ability to pass arguments to zkasm-result.py

---
 .github/workflows/main.yml |  3 +--
 ci/spectest-zkasm.sh       | 11 -----------
 ci/test-all-zkasm.sh       | 16 ++++++++++++++++
 ci/test-zkasm.sh           |  7 +++++--
 4 files changed, 22 insertions(+), 15 deletions(-)
 delete mode 100755 ci/spectest-zkasm.sh
 create mode 100755 ci/test-all-zkasm.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2ee3aaa9d62..66c80d7f865e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,8 +48,7 @@ jobs:
         cache: 'npm'
         cache-dependency-path: tests/zkasm/package-lock.json
     - run: npm ci --prefix tests/zkasm
-    - run: ./ci/test-zkasm.sh
-    - run: ./ci/spectest-zkasm.sh
+    - run: ./ci/test-all-zkasm.sh
     
 
   rustfmt:
diff --git a/ci/spectest-zkasm.sh b/ci/spectest-zkasm.sh
deleted file mode 100755
index 10ccc4065d34..000000000000
--- a/ci/spectest-zkasm.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -o pipefail
-set -eux
-
-./ci/test-zkasm.sh "cranelift/zkasm_data/spectest/i32"
-./ci/test-zkasm.sh "cranelift/zkasm_data/spectest/i64"
-./ci/test-zkasm.sh "cranelift/zkasm_data/spectest/conversions"
-# TODO(akashin): Move this out to a separate shell script or rename this shell script to be
-# more general.
-./ci/test-zkasm.sh "cranelift/zkasm_data/benchmarks/fibonacci"
diff --git a/ci/test-all-zkasm.sh b/ci/test-all-zkasm.sh
new file mode 100755
index 000000000000..7c5191d6042b
--- /dev/null
+++ b/ci/test-all-zkasm.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+set -eux
+
+ALL_ARGS=$@
+
+function run_tests() {
+	./ci/test-zkasm.sh $1 $ALL_ARGS
+}
+
+run_tests "cranelift/zkasm_data"
+run_tests "cranelift/zkasm_data/spectest/i32"
+run_tests "cranelift/zkasm_data/spectest/i64"
+run_tests "cranelift/zkasm_data/spectest/conversions"
+run_tests "cranelift/zkasm_data/benchmarks/fibonacci"
diff --git a/ci/test-zkasm.sh b/ci/test-zkasm.sh
index b89746337cf2..13ffa569160c 100755
--- a/ci/test-zkasm.sh
+++ b/ci/test-zkasm.sh
@@ -9,7 +9,10 @@ if [ ! -d "tests/zkasm/node_modules" ]; then
 	npm install --prefix tests/zkasm
 fi
 
-TEST_PATH=${1:-"cranelift/zkasm_data"}
+# All arguments will be forwarded to `ci/zkasm-result.py`.
+ALL_ARGS=$@
+# The first argument is expected to be a path to a folder with tests.
+TEST_PATH=$1
 TEST_RESULTS_PATH=$(mktemp)
 npm test --prefix tests/zkasm "../../${TEST_PATH}/generated" $TEST_RESULTS_PATH
-python3 ci/zkasm-result.py $TEST_PATH < $TEST_RESULTS_PATH
+python3 ci/zkasm-result.py $ALL_ARGS < $TEST_RESULTS_PATH