Commit bd6887bb authored by Dion Haefner's avatar Dion Haefner

added python3 testing

parent 8000e4a9
...@@ -23,6 +23,19 @@ build:main: ...@@ -23,6 +23,19 @@ build:main:
- $CI_PROJECT_DIR/build-cmake/doc/html/ - $CI_PROJECT_DIR/build-cmake/doc/html/
expire_in: 1 week expire_in: 1 week
build:python3:
script:
- cd /opt/dune/venv
- virtualenv dorie3 --py=/usr/bin/python3
- source /opt/dune/venv/dorie3/bin/activate && python --version && python -m pip install virtualenv
- cd /opt/dune
- python --version
- ./dune-common/bin/dunecontrol exec "rm -rf build-cmake"
- ./dune-common/bin/dunecontrol all
- export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
- ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
stage: build
build:update_dune: build:update_dune:
script: script:
- ./dune-common/bin/dunecontrol update || true - ./dune-common/bin/dunecontrol update || true
......
...@@ -25,8 +25,8 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@" ...@@ -25,8 +25,8 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@"
DORIE_EXECUTABLE = os.path.join(DORIEDIR, "dune/dorie/dorie") DORIE_EXECUTABLE = os.path.join(DORIEDIR, "dune/dorie/dorie")
PARAMETERDIR = os.path.join(DORIEDIR, "doc/default_files") PARAMETERDIR = os.path.join(DORIEDIR, "doc/default_files")
DORIE_PYTHON = os.path.join(DORIEDIR, "dune-env") DORIE_PYTHON = os.path.join(DORIEDIR, "dune-env")
def MPIRUN(nproc,exe,*args,mpi_flags=None): def MPIRUN(nproc,exe,*args,**kwargs):
mpi_flags = [] if not mpi_flags else list(mpi_flags) mpi_flags = [] if not "mpi_flags" in kwargs else kwargs["mpi_flags"]
return [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc)] \ return [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc)] \
+ mpi_flags + [MPIEXEC_PREFLAG,str(exe), + mpi_flags + [MPIEXEC_PREFLAG,str(exe),
MPIEXEC_POSTFLAGS] + list(args) if k] MPIEXEC_POSTFLAGS] + list(args) if k]
......
...@@ -23,8 +23,8 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@" ...@@ -23,8 +23,8 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@"
# #
RFG_EXEC = os.path.join(DORIEDIR, "dune/dorie-rfg/dorie-rfg") RFG_EXEC = os.path.join(DORIEDIR, "dune/dorie-rfg/dorie-rfg")
def MPIRUN(nproc,exe,*args,mpi_flags=None): def MPIRUN(nproc,exe,*args,**kwargs):
mpi_flags = [] if not mpi_flags else list(mpi_flags) mpi_flags = [] if not "mpi_flags" in kwargs else kwargs["mpi_flags"]
return [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc)] \ return [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc)] \
+ mpi_flags + [MPIEXEC_PREFLAG,str(exe), + mpi_flags + [MPIEXEC_PREFLAG,str(exe),
MPIEXEC_POSTFLAGS] + list(args) if k] MPIEXEC_POSTFLAGS] + list(args) if k]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment