Skip to content

GitLab

Commit 236fb79b authored by Jason Swails's avatar Jason Swails
Browse files

Few small fixes

parent 78ccbbe9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
devtools/ci/jenkins/install.sh
View file @ 236fb79b
...@@ -27,16 +27,15 @@ conda install -yn ${CONDAENV} numpy scipy pytest --quiet ...@@ -27,16 +27,15 @@ conda install -yn ${CONDAENV} numpy scipy pytest --quiet
source activate ${CONDAENV} # enter our new environment source activate ${CONDAENV} # enter our new environment
# Build OpenMM # Build OpenMM
CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=\"${INSTALL_DIRECTORY}\" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang"
cd "${SRC_DIRECTORY}" cd "${SRC_DIRECTORY}"
cmake $CMAKE_FLAGS . cmake -DCMAKE_INSTALL_PREFIX="${INSTALL_DIRECTORY}" -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang .
make -j4 install make -j4 install
make PythonInstall make PythonInstall
# Now run the tests # Now run the tests
python -m simtk.testInstallation python -m simtk.testInstallation
cd python/tests && py.test -v cd python/tests && py.test -v && cd ../..
python devtools/run-ctest.py --start-time $START_TIME python devtools/run-ctest.py --start-time $(date +%s)
# Now remove the conda environment # Now remove the conda environment
source deactivate source deactivate
......
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