Merge remote-tracking branch 'upstream/v6.1-dev' into v6.1-dev

StuartWheater · StuartWheater · commit d459a1e2af9d · 2020-08-29T20:58:34.000+01:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -335,7 +335,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
-                testthat::test_package("$(projectName)", filter = "smk_dgr-",reporter = multi_rep, stop_on_failure = FALSE)
+                testthat::test_package("$(projectName)", filter = "_dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
             )
         );

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ jobs:`
`335`	`335`	`junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");`
`336`	`336`	`progress_rep <- ProgressReporter$new(max_failures = 999999);`
`337`	`337`	`multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));`
`338`		`- testthat::test_package("$(projectName)", filter = "smk_dgr-",reporter = multi_rep, stop_on_failure = FALSE)`
	`338`	`+ testthat::test_package("$(projectName)", filter = "_dgr-\|datachk_dgr-\|smk_dgr-\|arg_dgr-\|disc_dgr-\|smk_expt_dgr-\|expt_dgr-\|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)`
`339`	`339`	`'"'"'`
`340`	`340`	`)`
`341`	`341`	`);`