Skip to content

Commit 294ce99

Browse files
committed
do not drop stdout
1 parent 6113fe7 commit 294ce99

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

R/pkg/R/utils.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -756,12 +756,12 @@ varargsToJProperties <- function(...) {
756756
props
757757
}
758758

759-
launchScript <- function(script, combinedArgs, capture = FALSE) {
759+
launchScript <- function(script, combinedArgs, wait = FALSE) {
760760
if (.Platform$OS.type == "windows") {
761761
scriptWithArgs <- paste(script, combinedArgs, sep = " ")
762-
shell(scriptWithArgs, translate = TRUE, wait = capture, intern = capture) # nolint
762+
shell(scriptWithArgs, translate = TRUE, wait = wait, intern = wait) # nolint
763763
} else {
764-
system2(script, combinedArgs, wait = capture, stdout = capture)
764+
system2(script, combinedArgs, wait = wait)
765765
}
766766
}
767767

R/pkg/inst/tests/testthat/test_Windows.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test_that("sparkJars tag in SparkContext", {
2020
if (.Platform$OS.type != "windows") {
2121
skip("This test is only for Windows, skipped")
2222
}
23-
testOutput <- launchScript("ECHO", "a/b/c", capture = TRUE)
23+
testOutput <- launchScript("ECHO", "a/b/c", wait = TRUE)
2424
abcPath <- testOutput[1]
2525
expect_equal(abcPath, "a\\b\\c")
2626
})

0 commit comments

Comments
 (0)