Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Ansgar Burchardt
dune-docker
Commits
c12ebb2f
Commit
c12ebb2f
authored
Oct 18, 2016
by
Ansgar Burchardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Symlink (or use) `dune-ctest` when installing (or building) `dune-common`
parent
6d138b2f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
base-common/duneci-install-module
base-common/duneci-install-module
+6
-1
base-common/duneci-standard-test
base-common/duneci-standard-test
+6
-1
dune-git/Dockerfile
dune-git/Dockerfile
+1
-0
No files found.
base-common/duneci-install-module
View file @
c12ebb2f
...
...
@@ -44,7 +44,12 @@ module="${repo##*/}"; module="${module%.git}"
shift
if
[[
"
${
module
}
"
=
dune-common
]]
;
then
ln
-sf
/duneci/modules/dune-common/bin/dunecontrol /duneci/bin
for
f
in
dunecontrol dune-ctest
;
do
src
=
/duneci/modules/dune-common/bin/
${
f
}
if
[[
-x
${
src
}
]]
;
then
ln
-sf
${
src
}
/duneci/bin/
fi
done
fi
cd
/duneci/modules
...
...
base-common/duneci-standard-test
View file @
c12ebb2f
...
...
@@ -12,8 +12,13 @@ if [[ -x bin/dunecontrol ]]; then
DUNECONTROL
=
bin/dunecontrol
fi
DUNE_CTEST
=
duneci-ctest
if
[[
-x
bin/dune-ctest
]]
;
then
DUNE_CTEST
=
../bin/dune-ctest
fi
set
-x
${
DUNECONTROL
}
--current
"
${
@
}
"
all
${
DUNECONTROL
}
--current
make build_tests
cd
build-cmake
dune-ctest
${
DUNE_CTEST
}
dune-git/Dockerfile
View file @
c12ebb2f
...
...
@@ -23,3 +23,4 @@ RUN ln -s /duneci/modules/dune-common/bin/dunecontrol /usr/local/bin/
USER
duneci
WORKDIR
/duneci
RUN
ln
-sf
/duneci/modules/dune-common/bin/dune-ctest /duneci/bin/
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