From 3237a786da68b13005fdb8982a0c219c9c68cc0f Mon Sep 17 00:00:00 2001
From: Olivia Appleton <olivia.kay.appleton@gmail.com>
Date: Wed, 26 Jun 2024 20:52:15 -0500
Subject: [PATCH] Speed up c, python tests

---
 .github/workflows/c.yml      | 18 ++++++++++++------
 .github/workflows/python.yml |  2 +-
 c/Makefile                   |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index 32fd3e0f..4b7ad00b 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
 #         compiler: ["llvm", "gcc"]
 #         # compiler targets (ideally): clang, gcc, MSVCC, pcc, tcc, icc, 
-         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
+         os: [ubuntu-latest, windows-latest, macos-latest, macos-13, ubuntu-20.04]
 #         include:
 #           - os: windows-latest
 #             compiler: msvc
@@ -39,7 +39,9 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: "3.10"
-        cache-dependency-path: c/requirements.txt
+        cache-dependency-path: |
+          c/requirements.txt
+          python/requirements.txt
 
 #     - name: Setup Cpp ${{ matrix.compiler }}
 #       uses: aminya/setup-cpp@v1
@@ -53,13 +55,17 @@ jobs:
 #       with:
 #         platform: x64
 
-    - name: Run tests (windows + linux)
-      if: ${{ !contains(matrix.os, 'macos') }}
-      run: make ctest
+    - name: Run tests (linux)
+      if: ${{ contains(matrix.os, 'ubuntu') }}
+      run: make ctest${{ matrix.os == 'ubuntu-latest' && '_auto' }}
+
+    - name: Run tests (windows)
+      if: ${{ contains(matrix.os == 'windows') }}
+      run: make ctest_auto
 
     - name: Run tests (macos)
       if: ${{ contains(matrix.os, 'macos') }}
-      run: make ctest
+      run: make ctest_auto
       env:
         NO_OPTIONAL_TESTS: true
         COMPILER_OVERRIDE: clang
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 4e20e33b..5ad35815 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -69,4 +69,4 @@ jobs:
           c/requirements.txt
 
     - name: Run tests
-      run: make pytest LINT=false
+      run: make pytest${{ (!contains(matrix.os, 'latest') || matrix.version != '3.12') && '_auto LINT=false' }}
diff --git a/c/Makefile b/c/Makefile
index 48f567fb..a69617ba 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -13,6 +13,7 @@ endif
 endif
 
 test_%: dependencies
+	cd ../python; $(MAKE) dependencies $(MFLAGS)
 	$(PY) -m pytest -vl -n$* test_euler.py
 
 test: dependencies