Skip to content

Commit ce56b15

Browse files
fangereransalond
authored andcommitted
pkgtest: remove quotes for 'FASTR_INTERNAL_ARGS'.
(cherry picked from commit acb2374)
1 parent 325ff9f commit ce56b15

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

com.oracle.truffle.r.release/src/R_legacy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ cp="$JAVA_HOME/jre/languages/R/fastr-launcher.jar:$cp"
116116
## REMOVE FOR NATIVE IMAGE: END
117117
# internal variable used to pass args to child R processes
118118
if [ -z "$FASTR_INTERNAL_ARGS" ]; then
119-
FASTR_INTERNAL_ARGS=()
119+
FASTR_INTERNAL_ARGS=""
120120
fi
121121

122122
# we can invoke FastR directly, but we do have to set R_HOME
123123
export R_HOME="$JRE/languages/R"
124-
exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${jvm_args[@]}" com.oracle.truffle.r.launcher.RMain R "${FASTR_INTERNAL_ARGS[@]}" "${launcher_args[@]}"
124+
exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${jvm_args[@]}" com.oracle.truffle.r.launcher.RMain R ${FASTR_INTERNAL_ARGS[@]} "${launcher_args[@]}"

com.oracle.truffle.r.release/src/Rscript_legacy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ cp="$JAVA_HOME/jre/languages/R/fastr-launcher.jar:$cp"
116116
## REMOVE FOR NATIVE IMAGE: END
117117
# internal variable used to pass args to child R processes
118118
if [ -z "$FASTR_INTERNAL_ARGS" ]; then
119-
FASTR_INTERNAL_ARGS=()
119+
FASTR_INTERNAL_ARGS=""
120120
fi
121121

122122
# we can invoke FastR directly, but we do have to set R_HOME
123123
export R_HOME="$JRE/languages/R"
124-
exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${jvm_args[@]}" com.oracle.truffle.r.launcher.RMain Rscript "${FASTR_INTERNAL_ARGS[@]}" "${launcher_args[@]}"
124+
exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${jvm_args[@]}" com.oracle.truffle.r.launcher.RMain Rscript ${FASTR_INTERNAL_ARGS[@]} "${launcher_args[@]}"

0 commit comments

Comments
 (0)