From f17b6a60365bc4b5c8d3d8be9ebb0f1de3f4d984 Mon Sep 17 00:00:00 2001
From: Sebastian Weber <sebastian.weber@novartis.com>
Date: Fri, 22 Feb 2019 13:02:05 +0100
Subject: [PATCH 1/5] add Windows threading test stage

---
 Jenkinsfile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6cb1ec0e6ee..b47612d7909 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -225,6 +225,18 @@ pipeline {
                     }
                     post { always { retry(3) { deleteDir() } } }
                 }
+                stage('Windows Threading tests') {
+                    agent { label 'windows' }
+                    steps {
+                        deleteDirWin()
+                        unstash 'MathSetup'
+                        bat "echo CXX=${env.CXX} -Werror > make/local"
+                        bat "echo CPPFLAGS+=-DSTAN_THREADS >> make/local"
+                        runTestsWin("test/unit -f thread")
+                        bat "find . -name *_test.xml | xargs rm"
+                        runTestsWin("test/unit -f map_rect")
+                    }
+                }
             }
         }
         stage('Additional merge tests') {

From 28847d95f9efbb5371c898fdc78df289bce9ba00 Mon Sep 17 00:00:00 2001
From: Sebastian Weber <sebastian.weber@novartis.com>
Date: Fri, 22 Feb 2019 15:17:19 +0100
Subject: [PATCH 2/5] fix syntax error and ensure that STAN_NUM_THREADS is set

---
 Jenkinsfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b47612d7909..e627672842e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,6 +49,9 @@ pipeline {
         skipDefaultCheckout()
         preserveStashes(buildCount: 7)
     }
+    environment {
+        STAN_NUM_THREADS = "4"
+    }
     stages {
         stage('Kill previous builds') {
             when {
@@ -233,7 +236,7 @@ pipeline {
                         bat "echo CXX=${env.CXX} -Werror > make/local"
                         bat "echo CPPFLAGS+=-DSTAN_THREADS >> make/local"
                         runTestsWin("test/unit -f thread")
-                        bat "find . -name *_test.xml | xargs rm"
+                        bat "find . -name *_test.xml -exec rm {} \;"
                         runTestsWin("test/unit -f map_rect")
                     }
                 }

From 2d1bf6f39428a633df5b321a4dd860181cc5d116 Mon Sep 17 00:00:00 2001
From: Sebastian Weber <sebastian.weber@novartis.com>
Date: Fri, 22 Feb 2019 15:18:55 +0100
Subject: [PATCH 3/5] fix string syntax

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e627672842e..268ea3ce5b3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
         preserveStashes(buildCount: 7)
     }
     environment {
-        STAN_NUM_THREADS = "4"
+        STAN_NUM_THREADS = '4'
     }
     stages {
         stage('Kill previous builds') {

From ef718407b3bfe98d341ca3f11e3398f2cac3d256 Mon Sep 17 00:00:00 2001
From: Sebastian Weber <sebastian.weber@novartis.com>
Date: Fri, 22 Feb 2019 15:21:37 +0100
Subject: [PATCH 4/5] more syntax issues

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 268ea3ce5b3..0729d969b28 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -236,7 +236,7 @@ pipeline {
                         bat "echo CXX=${env.CXX} -Werror > make/local"
                         bat "echo CPPFLAGS+=-DSTAN_THREADS >> make/local"
                         runTestsWin("test/unit -f thread")
-                        bat "find . -name *_test.xml -exec rm {} \;"
+                        bat "find . -name *_test.xml -exec rm {} \\;"
                         runTestsWin("test/unit -f map_rect")
                     }
                 }

From a7bf7782432d57c195cc2fe90e9eb3fe7dffbfe1 Mon Sep 17 00:00:00 2001
From: Sebastian Weber <sdw.post@waebers.de>
Date: Fri, 22 Feb 2019 17:11:40 +0100
Subject: [PATCH 5/5] move windows test earlier and fix find in Jenksinfile

---
 Jenkinsfile | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0729d969b28..6be37f3faa8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -184,6 +184,17 @@ pipeline {
                         runTestsWin("test/unit")
                     }
                 }
+                stage('Windows Threading tests') {
+                    agent { label 'windows' }
+                    steps {
+                        deleteDirWin()
+                        unstash 'MathSetup'
+                        bat "echo CXX=${env.CXX} -Werror > make/local"
+                        bat "echo CPPFLAGS+=-DSTAN_THREADS >> make/local"
+                        runTestsWin("test/unit -f thread")
+                        runTestsWin("test/unit -f map_rect")
+                    }
+                }
             }
         }
         stage('Always-run tests part 2') {
@@ -228,18 +239,6 @@ pipeline {
                     }
                     post { always { retry(3) { deleteDir() } } }
                 }
-                stage('Windows Threading tests') {
-                    agent { label 'windows' }
-                    steps {
-                        deleteDirWin()
-                        unstash 'MathSetup'
-                        bat "echo CXX=${env.CXX} -Werror > make/local"
-                        bat "echo CPPFLAGS+=-DSTAN_THREADS >> make/local"
-                        runTestsWin("test/unit -f thread")
-                        bat "find . -name *_test.xml -exec rm {} \\;"
-                        runTestsWin("test/unit -f map_rect")
-                    }
-                }
             }
         }
         stage('Additional merge tests') {