From 7d21ab192982ba4e1941e77b71e155df8fb39037 Mon Sep 17 00:00:00 2001
From: Daejun Park <daejunpark@gmail.com>
Date: Tue, 12 Sep 2023 15:14:13 -0700
Subject: [PATCH] ci: refactor ffi test script

---
 .github/workflows/test-ffi.yml  | 41 ---------------------------------
 .github/workflows/test-long.yml |  6 ++++-
 2 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/test-ffi.yml

diff --git a/.github/workflows/test-ffi.yml b/.github/workflows/test-ffi.yml
deleted file mode 100644
index 262d4df2..00000000
--- a/.github/workflows/test-ffi.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Test FFI
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  test:
-    runs-on: macos-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - testname: "ffi:tests"
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install pytest
-
-      - name: Install Halmos
-        run: pip install -e .
-
-      - name: Run pytest
-        run: pytest -v tests/test_halmos.py -k ${{ matrix.testname }} --halmos-options="--ffi -v -st --error-unknown --test-parallel --solver-parallel --solver-timeout-assertion 0"
diff --git a/.github/workflows/test-long.yml b/.github/workflows/test-long.yml
index c15e8a41..786ff6b2 100644
--- a/.github/workflows/test-long.yml
+++ b/.github/workflows/test-long.yml
@@ -15,7 +15,11 @@ jobs:
       matrix:
         include:
         - testname: "examples/tokens/ERC20"
+          testopts: ""
         - testname: "examples/tokens/ERC721"
+          testopts: ""
+        - testname: "ffi:tests"
+          testopts: "--ffi"
 
     steps:
       - uses: actions/checkout@v3
@@ -39,4 +43,4 @@ jobs:
         run: pip install -e .
 
       - name: Run pytest
-        run: pytest -v tests/test_halmos.py -k ${{ matrix.testname }} --halmos-options="-v -st --error-unknown --test-parallel --solver-parallel --solver-timeout-assertion 0"
+        run: pytest -v tests/test_halmos.py -k ${{ matrix.testname }} --halmos-options="-v -st --error-unknown --test-parallel --solver-parallel --solver-timeout-assertion 0 ${{ matrix.testopts }}"