From 1158946cef81f234728dd8c63c93eb40aba6d4c5 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Wed, 7 Nov 2018 10:02:53 +0100
Subject: [PATCH] increase dune-functions bin count, ignore gcov errors
---
.gitsuper | 52 ++++++++++++++++++++-------------------------
.travis.script.bash | 5 +----
2 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index 9a01e419b..8aca28a72 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,26 +1,25 @@
[supermodule]
-remote = git@github.com:dune-community/dune-gdt-super.git
+remote = git@github.com:dune-community/dune-xt-super.git
status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
- 20a673b9dad7e2e25bd97defa8849debb59d247c config.opts (20a673b)
+ 5147d438044a772a07fd89ff142d861cfc82212e config.opts (heads/master)
8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
- +cb992cf33366dc2d1e60a912718a57e760b0b31f dune-gdt (heads/new-master)
- 390a2c503783bbed778a8ff610f8c5ca09c238d0 dune-geometry (v2.5.1-5-g390a2c5)
+ e6350271b8d014adab51467a35b6ad8ef48212a0 dune-geometry (v2.5.1-6-ge635027)
d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5)
- 9e29a333e8af02382d80b95335a784d5ce1ea2c8 dune-grid-glue (v2.4.0-70-g9e29a33)
+ e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33)
63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1)
0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1)
8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest)
- 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2)
- f3fb573585a5239db7c790a5fd2da2ba765d916f dune-xt-common (heads/master)
+ 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9)
+ +0a68a9c971451632566cb16a4f8acc7314f34d92 dune-xt-common (heads/master)
3e3f3bf06e21cbbf3c0a559891b44c6f5d987d0f dune-xt-data (heads/master)
- +5b56980a4197badfe3fe5708087889b536192c9b dune-xt-functions (heads/new-master)
- +82ddaff8c04d5c3ea57452d89c9b5fdbc272f036 dune-xt-grid (heads/new-master)
- +ad6d09c610a89863c0030808a8cb95a134af7ce9 dune-xt-la (heads/match-dune-gdt-refactor)
+ +b1c8290678a246216af149dc945d0be47998ef6f dune-xt-functions (heads/master)
+ 7960307789e83d8da00efdad48ccdbc7d4201e6b dune-xt-grid (heads/master)
+ +4783a5717675335066a74a7b91c58a613c006eda dune-xt-la (heads/master)
09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = f3ac7b0c0a5ff1b07f7e3e58cac29946cb6ecfed
+commit = 2f293876f0e9058196c1df69190ed0de52e225c6
[submodule.bin]
remote = git@github.com:dune-community/local-bin.git
@@ -30,7 +29,7 @@ commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8
[submodule.config.opts]
remote = git@github.com:dune-community/config.opts.git
status =
-commit = 20a673b9dad7e2e25bd97defa8849debb59d247c
+commit = 5147d438044a772a07fd89ff142d861cfc82212e
[submodule.dune-alugrid]
remote = https://github.com/dune-mirrors/dune-alugrid.git
@@ -42,33 +41,28 @@ remote = git@github.com:dune-community/dune-common.git
status =
commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f
-[submodule.dune-gdt]
-remote = git@github.com:dune-community/dune-gdt.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = cb992cf33366dc2d1e60a912718a57e760b0b31f
-
[submodule.dune-geometry]
-remote = git@github.com:dune-community/dune-geometry.git
+remote = http://github.com/dune-community/dune-geometry.git
status =
-commit = 390a2c503783bbed778a8ff610f8c5ca09c238d0
+commit = e6350271b8d014adab51467a35b6ad8ef48212a0
[submodule.dune-grid]
-remote = git@github.com:dune-community/dune-grid.git
+remote = http://github.com/dune-community/dune-grid.git
status =
commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e
[submodule.dune-grid-glue]
remote = https://github.com/dune-mirrors/dune-grid-glue.git
status =
-commit = 9e29a333e8af02382d80b95335a784d5ce1ea2c8
+commit = e9d9a3336735090648637e044e279866bbea3597
[submodule.dune-istl]
-remote = https://github.com/dune-mirrors/dune-istl.git
+remote = http://github.com/dune-mirrors/dune-istl.git
status =
commit = 63df56a54f81eda308233a683eb329e77e69f0a9
[submodule.dune-localfunctions]
-remote = https://github.com/dune-mirrors/dune-localfunctions.git
+remote = http://github.com/dune-mirrors/dune-localfunctions.git
status =
commit = 0d757d65e5d57134a7ecf304e35d063f4ccc7116
@@ -90,32 +84,32 @@ commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79
[submodule.dune-uggrid]
remote = https://github.com/dune-mirrors/dune-uggrid.git
status =
-commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e
+commit = 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9
[submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = f3fb573585a5239db7c790a5fd2da2ba765d916f
+commit = 0a68a9c971451632566cb16a4f8acc7314f34d92
[submodule.dune-xt-data]
-remote = git@github.com:dune-community/dune-xt-data
+remote = https://github.com/dune-community/dune-xt-data
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
commit = 3e3f3bf06e21cbbf3c0a559891b44c6f5d987d0f
[submodule.dune-xt-functions]
remote = git@github.com:dune-community/dune-xt-functions.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 5b56980a4197badfe3fe5708087889b536192c9b
+commit = b1c8290678a246216af149dc945d0be47998ef6f
[submodule.dune-xt-grid]
remote = git@github.com:dune-community/dune-xt-grid.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 82ddaff8c04d5c3ea57452d89c9b5fdbc272f036
+commit = 7960307789e83d8da00efdad48ccdbc7d4201e6b
[submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = ad6d09c610a89863c0030808a8cb95a134af7ce9
+commit = 4783a5717675335066a74a7b91c58a613c006eda
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
diff --git a/.travis.script.bash b/.travis.script.bash
index a9484b0d6..ac74449eb 100755
--- a/.travis.script.bash
+++ b/.travis.script.bash
@@ -28,9 +28,6 @@ else
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST} -L "^builder_${TESTS}$"
fi
-${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} install | grep -v "Installing"
-${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} package_source
-
# clang coverage currently disabled for being to mem hungry
if [[ ${CC} == *"clang"* ]] ; then
exit 0
@@ -42,7 +39,7 @@ lcov --directory . --output-file ${COVERAGE_INFO} -c
for d in "dune-common" "dune-pybindxi" "dune-geometry" "dune-istl" "dune-grid" "dune-alugrid" "dune-uggrid" "dune-localfunctions" ; do
lcov --directory . --output-file ${COVERAGE_INFO} -r ${COVERAGE_INFO} "${SUPERDIR}/${d}/*"
done
-lcov --directory . --output-file ${COVERAGE_INFO} -r ${COVERAGE_INFO} "${SUPERDIR}/${MY_MODULE}/dune/xt/*/test/*"
+lcov --directory . --output-file ${COVERAGE_INFO} --ignore-errors gcov -r ${COVERAGE_INFO} "${SUPERDIR}/${MY_MODULE}/dune/xt/*/test/*"
cd ${SUPERDIR}/${MY_MODULE}
${OLDPWD}/dune-env pip install codecov
${OLDPWD}/dune-env codecov -v -X gcov -X coveragepy -F ctest -f ${COVERAGE_INFO} -t ${CODECOV_TOKEN}
--
GitLab