Skip to content
Snippets Groups Projects
Commit f0a72fbb authored by David Schwörer's avatar David Schwörer
Browse files

Only run nosetest if it exists

parent 35844c41
No related branches found
No related tags found
No related merge requests found
Pipeline #95091 passed
...@@ -4,6 +4,7 @@ helper.h ...@@ -4,6 +4,7 @@ helper.h
resolve_enum.pxd resolve_enum.pxd
boutcpp.pxd boutcpp.pxd
setup.py setup.py
setup.cfg
boutcore.cpp boutcore.cpp
\#*# \#*#
.#* .#*
......
...@@ -9,7 +9,7 @@ helper.cxx:helper.cxx.in ...@@ -9,7 +9,7 @@ helper.cxx:helper.cxx.in
boutcpp.pxd:boutcpp.pxd.in boutcpp.pxd:boutcpp.pxd.in
TOGEN=setup.py boutcore.pyx resolve_enum.pxd helper.cxx helper.h boutcpp.pxd setup.cfg TOGEN=setup.py boutcore.pyx resolve_enum.pxd helper.cxx helper.h boutcpp.pxd setup.cfg
$(TOGEN): Makefile $(BOUT_TOP)/make.config $(BOUT_TOP)/bin/bout-config common.sh $(TOGEN): Makefile $(BOUT_TOP)/make.config $(BOUT_TOP)/bin/bout-config common.sh helper.py $(TOGEN:%=%.in)
@echo " Generating $@" @echo " Generating $@"
@PATH=$(BOUT_TOP)/bin:$$PATH PY=$(PY) bash $@.in > $@.tmp \ @PATH=$(BOUT_TOP)/bin:$$PATH PY=$(PY) bash $@.in > $@.tmp \
|| (fail=$$?; echo "touch $@ to ignore failed generation" ; exit $$fail) || (fail=$$?; echo "touch $@ to ignore failed generation" ; exit $$fail)
......
...@@ -35,5 +35,11 @@ done ...@@ -35,5 +35,11 @@ done
for PYBIN in /opt/python/*/bin/; do for PYBIN in /opt/python/*/bin/; do
"${PYBIN}/pip" install $NAME --no-index -f /io/wheelhouse "${PYBIN}/pip" install $NAME --no-index -f /io/wheelhouse
(cd "$HOME"; "${PYBIN}/nosetests" $NAME) if test -e "${PYBIN}/nosetests"
then
(
cd "$HOME"
"${PYBIN}/nosetests" $NAME
)
fi
done done
version=$(git tag -l --points-at HEAD) version=$(git tag -l --points-at HEAD)
if ! $version ; then if ! test $version ; then
version=$(PYTHONPATH=.. $PY -c "import boutconfig ; print(boutconfig.config['version'])").dev$(git log --oneline |wc -l) version=$(PYTHONPATH=.. $PY -c "import boutconfig ; print(boutconfig.config['version'])").dev$(git log --oneline |wc -l)
fi fi
cat <<EOF cat <<EOF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment