Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-xt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ag-ohlberger
dune-community
dune-xt
Commits
764ca114
Commit
764ca114
authored
6 years ago
by
René Fritze
Committed by
René Milk
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[ci] allow no-change test refresh to succeed on read-only source
parent
bb07f336
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitsuper
+34
-34
34 additions, 34 deletions
.gitsuper
cmake/modules/DuneXTTesting.cmake
+19
-2
19 additions, 2 deletions
cmake/modules/DuneXTTesting.cmake
python/scripts/distribute_testing.py
+1
-1
1 addition, 1 deletion
python/scripts/distribute_testing.py
with
54 additions
and
37 deletions
.gitsuper
+
34
−
34
View file @
764ca114
[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)
+4
3c17427eb8a4a01eed4a3e0bc5bd3b0d7553427
dune-gdt (heads/d
ailywork_tleibner
)
+4
00f550efe560191acdc89450d29750ff0f5774f
dune-gdt (heads/d
rone_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_tleibn
er)
f93419066883a68c4e0ba96acc3d451ba971876a
dune-xt-data (heads/
dailywork_tleibn
er)
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/
mast
er)
b8cf8efc32e46511990b691afee55da3b7af15c8
dune-xt-data (heads/
mast
er)
+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 = 4
3c17427eb8a4a01eed4a3e0bc5bd3b0d7553427
commit = 4
00f550efe560191acdc89450d29750ff0f5774f
[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 = 8
3b29cbe84d0af6579d6904f59598ad3dd132996
commit = 8
a302389927725ea0b25610e333b5356b7382c88
[submodule.dune-xt-grid]
remote =
git@
github.com
:
dune-community/dune-xt-grid.git
status =
2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1
.vcsetup (heads/master)
commit = d
4d2b463a75b557fdec45069c1f43b20b40b6265
remote =
https://
github.com
/
dune-community/dune-xt-grid.git
status =
+7412205ae85537918f63bccf57d427bb88bd2478
.vcsetup (heads/master
-5-g7412205
)
commit = d
d30fcd7d4485eb2a8158d5ddf01333f58502c40
[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
This diff is collapsed.
Click to expand it.
cmake/modules/DuneXTTesting.cmake
+
19
−
2
View file @
764ca114
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
python/scripts/distribute_testing.py
+
1
−
1
View file @
764ca114
...
...
@@ -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
,
test
dir
,
binaries
,
all_testnames
,
processes
,
headerlibs
)
totals
=
do_timings
(
builddir
,
build
dir
,
binaries
,
all_testnames
,
processes
,
headerlibs
)
#bins = binpacking.to_constant_volume(totals, MAXTIME)
bins
=
binpacking
.
to_constant_bin_number
(
totals
,
bincount
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment