Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
7a00ea0b
Commit
7a00ea0b
authored
Jun 05, 2018
by
Emmanuel Promayon
Browse files
FIXED (tentative) testing another way to run Xfvb
parent
b0225574
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab/test.sh
View file @
7a00ea0b
...
...
@@ -16,10 +16,10 @@ if [[ "$osName" != "win7" ]]; then
echo
"===== Configuring xvfb ====="
# Starts the server first (try to avoid unexpected and random "QXcbConnection: Could not connect to display :99")
# see also https://doc.qt.io/qt-5/embedded-linux.html#linuxfb
Xvfb :42
-screen
0 1600x1200x24
-ac
+extension GLX +render
-noreset
-v
-fbdir
$workingDir
/ &
x
vfb
Pid
=
$!
echo
"PID of Xvfb:
$xvfbPid
"
export
DISPLAY
=
:42
export
DISPLAY
=
":98"
X
vfb
$DISPLAY
-screen
0 1600x1200x24
-ac
+extension GLX +render
-noreset
-v
-fbdir
$workingDir
/ &>
${
PROJECT_LOG_DIR
}
/test.log &
trap
"kill
$!
|| true"
EXIT
sleep
10
export
XAUTHORITY
=
/dev/null
fi
...
...
@@ -35,10 +35,10 @@ ctest -VV \
-S
$PROJECT_SOURCE_DIR
/sdk/cmake/ctest/ci-test.cmake
>
>(
tee
${
PROJECT_LOG_DIR
}
/test.log |
grep
--line-buffered
-e
"Test
\#
"
)
2>&1
if
[[
"
$OS
"
!=
"win7"
]]
;
then
# shutdown xvfb
kill
$xvfbPid
fi
#
if [[ "$OS" != "win7" ]]; then
#
# shutdown xvfb
#
kill $xvfbPid
#
fi
# as ctest return a strange 255 error, check the log
if
grep
--quiet
"Fatal error"
$CI_PROJECT_DIR
/
$PROJECT_LOG_DIR
/ci-test.log
;
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment