diff --git a/.gitsuper b/.gitsuper
index e36c5dba645404e1d446af53f9ede3d2504bd448..9928faa64bfe531e8cd1de8afc6785d38b158f3a 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,10 +1,10 @@
[supermodule]
remote = git@github.com:dune-community/dune-gdt-super.git
-status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
+status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (remotes/origin/HEAD)
20a673b9dad7e2e25bd97defa8849debb59d247c config.opts (heads/master)
8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
- +43c17427eb8a4a01eed4a3e0bc5bd3b0d7553427 dune-gdt (heads/dailywork_tleibner)
+ +400f550efe560191acdc89450d29750ff0f5774f dune-gdt (heads/drone_setup)
390a2c503783bbed778a8ff610f8c5ca09c238d0 dune-geometry (v2.5.1-5-g390a2c5)
d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5)
9e29a333e8af02382d80b95335a784d5ce1ea2c8 dune-grid-glue (v2.4.0-70-g9e29a33)
@@ -12,23 +12,23 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
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)
+ 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (heads/p/renemilk/testname_listing_hack_no-skiptest)
0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2)
- 3d4a5b7d9382eb27c692ec5143082ae9534796d3 dune-xt-common (heads/dailywork_tleibner)
- f93419066883a68c4e0ba96acc3d451ba971876a dune-xt-data (heads/dailywork_tleibner)
- 83b29cbe84d0af6579d6904f59598ad3dd132996 dune-xt-functions (heads/dailywork_tleibner)
- d4d2b463a75b557fdec45069c1f43b20b40b6265 dune-xt-grid (heads/master)
- +18a7221384cecc856eda906915cb9bd6b96d4b59 dune-xt-la (heads/remove_cow)
- 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = 139810133c1cd268a1930583f18788484e81039d
+ +bb07f3367f9a5dbbe3199424e5d5c645c66620ea dune-xt-common (heads/master)
+ b8cf8efc32e46511990b691afee55da3b7af15c8 dune-xt-data (heads/master)
+ +8a302389927725ea0b25610e333b5356b7382c88 dune-xt-functions (heads/introduce_xt-data)
+ +dd30fcd7d4485eb2a8158d5ddf01333f58502c40 dune-xt-grid (heads/master)
+ +fab7ebec48ebafb5cf541ea3ff696955b480a768 dune-xt-la (heads/master)
+ +c83fb5e4658b64634ee3a8c35532e422b9cbd413 scripts (c83fb5e)
+commit = 31cd9b944cf44ccd42fcf901a23a1461cbfc02d5
[submodule.bin]
-remote = git@github.com:dune-community/local-bin.git
+remote = https://github.com/dune-community/local-bin.git
status =
commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8
[submodule.config.opts]
-remote = git@github.com:dune-community/config.opts.git
+remote = https://github.com/dune-community/config.opts.git
status =
commit = 20a673b9dad7e2e25bd97defa8849debb59d247c
@@ -38,22 +38,22 @@ status =
commit = 8f2c5aba441417bf2c42f22272f538c68a89cc4a
[submodule.dune-common]
-remote = git@github.com:dune-community/dune-common.git
+remote = https://github.com/dune-community/dune-common.git
status =
commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f
[submodule.dune-gdt]
-remote = git@github.com:dune-community/dune-gdt.git
+remote = https://github.com/dune-community/dune-gdt.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 43c17427eb8a4a01eed4a3e0bc5bd3b0d7553427
+commit = 400f550efe560191acdc89450d29750ff0f5774f
[submodule.dune-geometry]
-remote = git@github.com:dune-community/dune-geometry.git
+remote = https://github.com/dune-community/dune-geometry.git
status =
commit = 390a2c503783bbed778a8ff610f8c5ca09c238d0
[submodule.dune-grid]
-remote = git@github.com:dune-community/dune-grid.git
+remote = https://github.com/dune-community/dune-grid.git
status =
commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e
@@ -73,8 +73,8 @@ status =
commit = 0d757d65e5d57134a7ecf304e35d063f4ccc7116
[submodule.dune-pybindxi]
-remote = git@github.com:dune-community/dune-pybindxi.git
-status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d)
+remote = https://github.com/dune-community/dune-pybindxi.git
+status = +7412205ae85537918f63bccf57d427bb88bd2478 .vcsetup (heads/master)
commit = 8a69fc68165780921bbba77da338b6932daf983c
[submodule.dune-python]
@@ -93,32 +93,32 @@ status =
commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e
[submodule.dune-xt-common]
-remote = git@github.com:dune-community/dune-xt-common.git
+remote = https://github.com/dune-community/dune-xt-common.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 3d4a5b7d9382eb27c692ec5143082ae9534796d3
+commit = bb07f3367f9a5dbbe3199424e5d5c645c66620ea
[submodule.dune-xt-data]
-remote = git@github.com:dune-community/dune-xt-data
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = f93419066883a68c4e0ba96acc3d451ba971876a
+remote = https://github.com/dune-community/dune-xt-data
+status = -2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup
+commit = b8cf8efc32e46511990b691afee55da3b7af15c8
[submodule.dune-xt-functions]
-remote = git@github.com:dune-community/dune-xt-functions.git
+remote = https://github.com/dune-community/dune-xt-functions.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 83b29cbe84d0af6579d6904f59598ad3dd132996
+commit = 8a302389927725ea0b25610e333b5356b7382c88
[submodule.dune-xt-grid]
-remote = git@github.com:dune-community/dune-xt-grid.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = d4d2b463a75b557fdec45069c1f43b20b40b6265
+remote = https://github.com/dune-community/dune-xt-grid.git
+status = +7412205ae85537918f63bccf57d427bb88bd2478 .vcsetup (heads/master-5-g7412205)
+commit = dd30fcd7d4485eb2a8158d5ddf01333f58502c40
[submodule.dune-xt-la]
-remote = git@github.com:dune-community/dune-xt-la.git
-status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 18a7221384cecc856eda906915cb9bd6b96d4b59
+remote = https://github.com/dune-community/dune-xt-la.git
+status = +7412205ae85537918f63bccf57d427bb88bd2478 .vcsetup (heads/master-6-g7412205)
+commit = fab7ebec48ebafb5cf541ea3ff696955b480a768
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
-status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (v0.2.0~10)
-commit = 09d0378f616b94d68bcdd9fc6114813181849ec0
+status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (fb5ebc1)
+commit = c83fb5e4658b64634ee3a8c35532e422b9cbd413
diff --git a/cmake/modules/DuneXTTesting.cmake b/cmake/modules/DuneXTTesting.cmake
index 5fac40678d0c352e87c3eb16e548de75600df4b9..f7794c1ea7b7bbb024fd168fac78dd54a639c0ed 100644
--- a/cmake/modules/DuneXTTesting.cmake
+++ b/cmake/modules/DuneXTTesting.cmake
@@ -222,6 +222,13 @@ macro(END_TESTCASES) # this excludes meta-ini variation test cases because ther
${CMAKE_CURRENT_BINARY_DIR}/dxt_all_sorted_testnames.cmake)
configure_file(${dune-xt-common-module-path}/dxt_headercheck_targets.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/dxt_headercheck_targets.cmake)
+ # we use a scatter/gather setup so this still goes thru (with no new/removed tests) on CI where SRC is mounted ro
+ add_custom_target(scatter_pickles_compile
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/compiles_totals.pickle"
+ "${CMAKE_BINARY_DIR}/compiles_totals.pickle")
+ add_custom_target(scatter_pickles_run
+ COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/testruns_totals.pickle"
+ "${CMAKE_BINARY_DIR}/testruns_totals.pickle")
add_custom_target(rerun_test_distribution
${CMAKE_BINARY_DIR}/dune-env
distribute_testing.py
@@ -232,13 +239,23 @@ macro(END_TESTCASES) # this excludes meta-ini variation test cases because ther
"${CMAKE_CURRENT_BINARY_DIR}/dxt_headercheck_targets.cmake"
"${DXT_BIN_COUNT}"
VERBATIM
- USES_TERMINAL)
+ USES_TERMINAL
+ DEPENDS scatter_pickles_compile scatter_pickles_run)
add_custom_target(copy_builders_if_different
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/builder_definitions.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/builder_definitions.cmake")
+ add_custom_target(gather_pickles_compile
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/compiles_totals.pickle"
+ "${CMAKE_CURRENT_SOURCE_DIR}/compiles_totals.pickle"
+ DEPENDS rerun_test_distribution)
+ add_custom_target(gather_pickles_run
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/testruns_totals.pickle"
+ "${CMAKE_CURRENT_SOURCE_DIR}/testruns_totals.pickle"
+ DEPENDS rerun_test_distribution)
+
add_custom_target(refresh_test_timings)
add_dependencies(copy_builders_if_different rerun_test_distribution)
- add_dependencies(refresh_test_timings copy_builders_if_different)
+ add_dependencies(refresh_test_timings copy_builders_if_different gather_pickles_compile gather_pickles_run)
endmacro(END_TESTCASES)
macro(dxt_exclude_from_headercheck)
diff --git a/python/scripts/distribute_testing.py b/python/scripts/distribute_testing.py
index 0a7e5f4a7b0b8c2623f3316b2dd98eda661b6106..a4ce3702c5e03e7bf88ee4e0adb6c2fa8d784fbb 100644
--- a/python/scripts/distribute_testing.py
+++ b/python/scripts/distribute_testing.py
@@ -170,7 +170,7 @@ logging.basicConfig(level=logging.DEBUG)
testname_map = {b: t.strip().split(';') for b,t in zip(binaries, all_testnames)}
processes = 1 #cpu_count()
-totals = do_timings(builddir, testdir, binaries, all_testnames, processes, headerlibs)
+totals = do_timings(builddir, builddir, binaries, all_testnames, processes, headerlibs)
#bins = binpacking.to_constant_volume(totals, MAXTIME)
bins = binpacking.to_constant_bin_number(totals, bincount)