Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gjs
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
Andrea Azzarone
gjs
Commits
b14c086f
Commit
b14c086f
authored
Mar 24, 2018
by
Claudio André
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: avoid paralelism so xvfb run properly
[skip eslint]
parent
3aae8f6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
.gitlab-ci.yml
.gitlab-ci.yml
+3
-0
test/test-ci.sh
test/test-ci.sh
+8
-8
No files found.
.gitlab-ci.yml
View file @
b14c086f
...
...
@@ -63,6 +63,7 @@ fedora:
variables
:
CC
:
gcc
DEV
:
devel
TEST
:
"
check"
ubuntu_gcc
:
<<
:
*build
...
...
@@ -115,6 +116,7 @@ sanitizer_gcc:
variables
:
CC
:
gcc
DEV
:
devel
TEST
:
"
check"
BUILD_OPTS
:
"
--enable-asan
--enable-ubsan"
sanitizer_clang
:
...
...
@@ -124,6 +126,7 @@ sanitizer_clang:
variables
:
CC
:
clang
DEV
:
devel
TEST
:
"
check"
BUILD_OPTS
:
"
--enable-asan
--enable-ubsan"
codequality
:
...
...
test/test-ci.sh
View file @
b14c086f
...
...
@@ -149,12 +149,12 @@ if [[ $1 == "GJS" ]]; then
echo
"Autogen options:
$ci_autogenargs
"
eval
./autogen.sh
"
$ci_autogenargs
"
if
[[
$TEST
==
"build"
]]
;
then
make
-sj
el
if
[[
$TEST
==
"distcheck"
]]
;
then
make
-s
j
distcheck
el
se
make
-s
j
check
make
-sj
if
[[
$TEST
==
"distcheck"
]]
;
then
make
-s
distcheck
el
if
[[
$TEST
==
"check"
]]
;
then
make
-s
check
fi
make
-sj
install
fi
...
...
@@ -167,9 +167,9 @@ elif [[ $1 == "GJS_EXTRA" ]]; then
PATH
=
$PATH
:~/.local/bin
if
[[
"
$DEV
"
!=
"devel"
]]
;
then
xvfb-run jhbuild run dbus-run-session
--
gnome-desktop-testing-runner gjs
xvfb-run
-a
--server-args
=
"-screen 0 1024x768x24"
jhbuild run dbus-run-session
--
gnome-desktop-testing-runner gjs
else
xvfb-run dbus-run-session
--
gnome-desktop-testing-runner gjs
xvfb-run
-a
--server-args
=
"-screen 0 1024x768x24"
dbus-run-session
--
gnome-desktop-testing-runner gjs
fi
elif
[[
$1
==
"GJS_COVERAGE"
]]
;
then
...
...
Write
Preview
Markdown
is supported
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