Skip to content

Commit eb39304

Browse files
committed
Update tests to use rtools-provided make
1 parent 58ab01b commit eb39304

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Jenkinsfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ pipeline {
192192
}
193193
post {
194194
always {
195-
recordIssues(
195+
recordIssues(
196196
id: "lint_doc_checks",
197197
name: "Linting & Doc checks",
198198
enabledForFailure: true,
@@ -264,8 +264,8 @@ pipeline {
264264
SET \"PATH=C:\\PROGRA~1\\R\\R-4.1.2\\bin;%PATH%\"
265265
SET \"PATH=C:\\PROGRA~1\\Microsoft^ MPI\\Bin;%PATH%\"
266266
SET \"MPI_HOME=C:\\PROGRA~1\\Microsoft^ MPI\\Bin\"
267-
mingw32-make.exe -f lib/stan_math/make/standalone math-libs
268-
mingw32-make.exe -j${PARALLEL} test-headers
267+
make.exe -f lib/stan_math/make/standalone math-libs
268+
make.exe -j${PARALLEL} test-headers
269269
"""
270270
setupCXX(false, WIN_CXX, stanc3_bin_url())
271271
runTestsWin("src/test/unit")
@@ -448,7 +448,7 @@ pipeline {
448448
SET \"PATH=C:\\PROGRA~1\\Microsoft^ MPI\\Bin;%PATH%\"
449449
SET \"MPI_HOME=C:\\PROGRA~1\\Microsoft^ MPI\\Bin\"
450450
cd performance-tests-cmdstan/cmdstan
451-
mingw32-make.exe -j${PARALLEL} build
451+
make.exe -j${PARALLEL} build
452452
cd ..
453453
python ./runPerformanceTests.py -j${PARALLEL} ${integration_tests_flags()}--runs=0 stanc3/test/integration/good
454454
python ./runPerformanceTests.py -j${PARALLEL} ${integration_tests_flags()}--runs=0 example-models
@@ -496,7 +496,7 @@ pipeline {
496496
post {
497497
always {
498498
node("linux") {
499-
recordIssues(
499+
recordIssues(
500500
id: "pipeline",
501501
name: "Entire pipeline results",
502502
enabledForFailure: true,

runTests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ def doCommand(command, exit_on_failure=True):
8080
"""Run command as a shell command and report/exit on errors."""
8181
print("------------------------------------------------------------")
8282
print("%s" % command)
83-
if isWin() and command.startswith("make "):
84-
command = command.replace("make ", "mingw32-make ")
8583
p1 = subprocess.Popen(command, shell=True)
8684
p1.wait()
8785
if exit_on_failure and (not (p1.returncode is None) and not (p1.returncode == 0)):

0 commit comments

Comments
 (0)