From 8a90660f7c444cba3608d03000ee49175819eada Mon Sep 17 00:00:00 2001
From: Ed <ed@xmos.com>
Date: Fri, 19 Apr 2024 17:24:29 +0100
Subject: [PATCH] Take build of pytest and do in Jenkins

---
 Jenkinsfile       | 1 +
 tests/conftest.py | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e063b361..5ab20179 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,6 +36,7 @@ pipeline {
                 dir("${REPO}/tests"){
                   viewEnv(){
                     withVenv{
+                      sh "xmake -C test_midi -j" // Xdist does not like building so do here
                       runPytest('--numprocesses=auto -vvv')
                     }
                   }
diff --git a/tests/conftest.py b/tests/conftest.py
index 58787c57..f0845cc9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -47,10 +47,11 @@ def options(request):
 @pytest.fixture(scope="session")
 def build_midi():
     cmd = "xmake -C test_midi -j"
-    result = subprocess.run(cmd, capture_output=True, text=True, shell=True)
-    all_build_success = result.returncode
+    # result = subprocess.run(cmd, capture_output=True, text=True, shell=True)
+    # return_code = result.returncode
+    return_code = 0
 
-    assert all_build_success == 0, f"{result.stderr}\n{result.stdout}"
+    assert return_code == 0, f"{result.stderr}\n{result.stdout}"
 
     return str(Path(__file__).parent / f"test_midi/bin/")