Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
418e510f
Commit
418e510f
authored
6 years ago
by
Dan Nixon
Browse files
Options
Downloads
Patches
Plain Diff
Use Xvfb on Linux build servers
Creates an X server for unit tests and user documentation generation and tests.
parent
bdc5222c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconfig/Jenkins/buildscript
+6
-3
6 additions, 3 deletions
buildconfig/Jenkins/buildscript
with
6 additions
and
3 deletions
buildconfig/Jenkins/buildscript
+
6
−
3
View file @
418e510f
...
...
@@ -15,11 +15,14 @@ SCRIPT_DIR=$(dirname "$0")
# System discovery
###############################################################################
USE_CORE_DUMPS
=
true
X11_RUNNER
=
""
if
[[
${
NODE_LABELS
}
==
*
rhel7
*
]]
||
[[
${
NODE_LABELS
}
==
*
centos7
*
]]
||
[[
${
NODE_LABELS
}
==
*
scilin7
*
]]
;
then
ON_RHEL7
=
true
X11_RUNNER
=
"xvfb-run"
fi
if
[[
${
NODE_LABELS
}
==
*
ubuntu
*
]]
;
then
ON_UBUNTU
=
true
X11_RUNNER
=
"xvfb-run"
fi
if
[[
${
NODE_LABELS
}
==
*
osx
*
]]
;
then
ON_MACOS
=
true
...
...
@@ -347,7 +350,7 @@ userprops_file=$userconfig_dir/Mantid.user.properties
echo
MultiThreaded.MaxCores
=
2
>
$userprops_file
if
[[
${
DO_UNITTESTS
}
==
true
]]
;
then
$CTEST_EXE
-j
${
BUILD_THREADS
:?
}
--schedule-random
--output-on-failure
${
X11_RUNNER
}
$CTEST_EXE
-j
${
BUILD_THREADS
:?
}
--schedule-random
--output-on-failure
fi
###############################################################################
...
...
@@ -362,8 +365,8 @@ if [[ ${DO_DOCTESTS_USER} == true ]]; then
rm
-fr
$BUILD_DIR
/docs/doctrees/
*
fi
# Build HTML to verify that no referencing errors have crept in.
${
CMAKE_EXE
}
--build
.
--target
docs-html
${
CMAKE_EXE
}
--build
.
--target
docs-test
${
X11_RUNNER
}
${
CMAKE_EXE
}
--build
.
--target
docs-html
${
X11_RUNNER
}
${
CMAKE_EXE
}
--build
.
--target
docs-test
fi
###############################################################################
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment