aboutsummaryrefslogtreecommitdiff
path: root/source/merge.d
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2019-05-27 19:38:06 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2019-05-27 19:38:06 -0400
commitfba3ce4d5ba5ec9093a1cfa397e4432f24d7f44a (patch)
tree7a163d03b735778302712e948ba4f566d7915df1 /source/merge.d
parentda0a1109fdfeb98fce2d870783fc24d9312e55a4 (diff)
downloaddm-fba3ce4d5ba5ec9093a1cfa397e4432f24d7f44a.tar.gz
handle xunit2
Diffstat (limited to 'source/merge.d')
-rw-r--r--source/merge.d8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/merge.d b/source/merge.d
index 7de55fe..e14f07a 100644
--- a/source/merge.d
+++ b/source/merge.d
@@ -194,6 +194,14 @@ auto integration_test(ref Conda conda, string outdir, test_runner_t runner, test
return 1;
}
+ if (runner.program == "pytest" || runner.program == "py.test") {
+ string testconf = "pytest.ini";
+ if (!testconf.exists) {
+ testconf = "setup.cfg";
+ }
+ pytest_xunit2(testconf);
+ }
+
if (conda.sh(runner.program ~ " " ~ runner.args ~ " --basetemp=" ~ basetemp) > 1) {
return 1;
}