Merge pull request #129 from near/zkasm_scripts

Add ability to pass arguments to zkasm-result.py

.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:

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"

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