Skip to content

Commit c835d29

Browse files
ENH: Slicer src are not mounted anymore in slicer/slicer-test:opengl image
* Remove mounted src (-v ...) from run-opengl.sh * Keep only useful files needed to run the tests from the src such as: - test.sh - CircleCI_Slicer_Docker.cmake - sumbit config CTestConfig.cmake (we copied directly what there is inside, into CircleCI_Slicer_Docker.cmake)
1 parent 81db3ac commit c835d29

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

CMake/CircleCI/CircleCI_Slicer_Docker.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,15 @@ set( BUILD_TESTING ON )
7070
#set( RUN_TEST_GUI "qSlicerWidgetTest2" )
7171
#set( CTEST_TEST_TARGET "${RUN_TEST_GUI}" )
7272

73-
######### Submit ##########
73+
######### Submit Config ##########
7474

75-
# Done automatically by reading the CTestConfig.cmake file inside /usr/src/Slicer
75+
set(CTEST_PROJECT_NAME "Slicer")
76+
set(CTEST_NIGHTLY_START_TIME "3:00:00 UTC")
77+
78+
set(CTEST_DROP_METHOD "http")
79+
set(CTEST_DROP_SITE "slicer.cdash.org")
80+
set(CTEST_DROP_LOCATION "/submit.php?project=Slicer4")
81+
set(CTEST_DROP_SITE_CDASH TRUE)
7682

7783
########## Run ctest #########
7884

CMake/CircleCI/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ RUN yum update -y && \
3737
valgrind \
3838
python2.7-dev
3939

40-
# Because the sources are mounted, we cannot `chown` on `/usr/src`
41-
# It authorizes to write in Slicer-build to recover logs of ctest
42-
ENV APP "sudo chown -R user.user /usr/src/Slicer-build && /usr/src/Slicer/CMake/CircleCI/test.sh"
40+
COPY test.sh /usr/src/test.sh
41+
COPY CircleCI_Slicer_Docker.cmake /usr/src/CircleCI_Slicer_Docker.cmake
42+
43+
# Authorize to write in Slicer-build to recover logs of ctest
44+
ENV APP "sudo chown -R user.user /usr/src/Slicer-build && /usr/src/test.sh"

CMake/CircleCI/run_opengl.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,11 @@ if [ -z "$quiet" ]; then
114114
fi
115115
fi
116116

117-
# We do not need the source BUT if we don't mount, we can't launch test.sh
118-
pwd_dir="`cd $(dirname $0)/../..; pwd`"
117+
#pwd_dir="`cd $(dirname $0)/../..; pwd`"
119118
mount_local=""
120-
if [ "${os}" = "Linux" ] || [ "${os}" = "Darwin" ]; then
121-
mount_local=" -v ${pwd_dir}:/usr/src/Slicer "
122-
fi
119+
#if [ "${os}" = "Linux" ] || [ "${os}" = "Darwin" ]; then
120+
# mount_local=" -v ${pwd_dir}:/usr/src/Slicer "
121+
#fi
123122
port_arg=""
124123
if [ -n "$port" ]; then
125124
port_arg="-p $port:6080"

CMake/CircleCI/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ mkdir /usr/src/Slicer-build/Slicer-build
1515
cd /usr/src/Slicer-build/Slicer-build || die "Could not cd into the build directory"
1616

1717
ctest \
18-
-S /usr/src/Slicer/CMake/CircleCI/CircleCI_Slicer_Docker.cmake \
18+
-S /usr/src/CircleCI_Slicer_Docker.cmake \
1919
-VV || die "ctest failed"

0 commit comments

Comments
 (0)