Skip to content

Commit

Permalink
Merge pull request #3281 from stan-dev/migrate-rtools-make
Browse files Browse the repository at this point in the history
Update tests to use rtools-provided make
WardBrian authored May 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 04708f4 + c224139 commit 06fbe08
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -192,7 +192,7 @@ pipeline {
}
post {
always {
recordIssues(
recordIssues(
id: "lint_doc_checks",
name: "Linting & Doc checks",
enabledForFailure: true,
@@ -264,8 +264,8 @@ pipeline {
SET \"PATH=C:\\PROGRA~1\\R\\R-4.1.2\\bin;%PATH%\"
SET \"PATH=C:\\PROGRA~1\\Microsoft^ MPI\\Bin;%PATH%\"
SET \"MPI_HOME=C:\\PROGRA~1\\Microsoft^ MPI\\Bin\"
mingw32-make.exe -f lib/stan_math/make/standalone math-libs
mingw32-make.exe -j${PARALLEL} test-headers
make.exe -f lib/stan_math/make/standalone math-libs
make.exe -j${PARALLEL} test-headers
"""
setupCXX(false, WIN_CXX, stanc3_bin_url())
runTestsWin("src/test/unit")
@@ -448,7 +448,7 @@ pipeline {
SET \"PATH=C:\\PROGRA~1\\Microsoft^ MPI\\Bin;%PATH%\"
SET \"MPI_HOME=C:\\PROGRA~1\\Microsoft^ MPI\\Bin\"
cd performance-tests-cmdstan/cmdstan
mingw32-make.exe -j${PARALLEL} build
make.exe -j${PARALLEL} build
cd ..
python ./runPerformanceTests.py -j${PARALLEL} ${integration_tests_flags()}--runs=0 stanc3/test/integration/good
python ./runPerformanceTests.py -j${PARALLEL} ${integration_tests_flags()}--runs=0 example-models
@@ -496,7 +496,7 @@ pipeline {
post {
always {
node("linux") {
recordIssues(
recordIssues(
id: "pipeline",
name: "Entire pipeline results",
enabledForFailure: true,
5 changes: 4 additions & 1 deletion make/tests
Original file line number Diff line number Diff line change
@@ -85,12 +85,15 @@ HEADER_TESTS := $(addsuffix -test,$(call findfiles,src/stan,*.hpp))

ifeq ($(OS),Windows_NT)
DEV_NULL = nul
ifeq ($(IS_UCRT),true)
UCRT_NULL_FLAG = -S
endif
else
DEV_NULL = /dev/null
endif

%.hpp-test : %.hpp test/dummy.cpp
$(COMPILE.cpp) -O0 -include $^ -o $(DEV_NULL)
$(COMPILE.cpp) -O0 -include $^ $(UCRT_NULL_FLAG) -o $(DEV_NULL)

test/dummy.cpp:
@mkdir -p test
2 changes: 0 additions & 2 deletions runTests.py
Original file line number Diff line number Diff line change
@@ -80,8 +80,6 @@ def doCommand(command, exit_on_failure=True):
"""Run command as a shell command and report/exit on errors."""
print("------------------------------------------------------------")
print("%s" % command)
if isWin() and command.startswith("make "):
command = command.replace("make ", "mingw32-make ")
p1 = subprocess.Popen(command, shell=True)
p1.wait()
if exit_on_failure and (not (p1.returncode is None) and not (p1.returncode == 0)):

0 comments on commit 06fbe08

Please sign in to comment.