Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ repos:
?^ci/scripts/r_install_system_dependencies\.sh$|
?^ci/scripts/r_revdepcheck\.sh$|
?^ci/scripts/r_sanitize\.sh$|
?^ci/scripts/r_test\.sh$|
?^ci/scripts/release_test\.sh$|
?^ci/scripts/ruby_test\.sh$|
?^ci/scripts/rust_build\.sh$|
Expand Down
16 changes: 10 additions & 6 deletions ci/scripts/r_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,19 @@

set -ex

: ${R_BIN:=R}
: "${R_BIN:=R}"

source_dir=${1}/r
source_dir="${1}/r"

pushd ${source_dir}
pushd "${source_dir}"

printenv

if [ -n "${ARROW_PYTHON_VENV:-}" ]; then
# We don't need to follow this external file.
# See also: https://www.shellcheck.net/wiki/SC1091
#
# shellcheck source=/dev/null
. "${ARROW_PYTHON_VENV}/bin/activate"
fi

Expand All @@ -47,8 +51,8 @@ if [ "$ARROW_R_FORCE_TESTS" = "true" ]; then
fi

if [ "$ARROW_USE_PKG_CONFIG" != "false" ]; then
export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
export R_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH="${ARROW_HOME}/lib:${LD_LIBRARY_PATH}"
export R_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
fi

export _R_CHECK_COMPILATION_FLAGS_KNOWN_="${_R_CHECK_COMPILATION_FLAGS_KNOWN_} ${ARROW_R_CXXFLAGS}"
Expand Down Expand Up @@ -126,7 +130,7 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
print(args)

rcmdcheck::rcmdcheck(build_args = build_args, args = args, error_on = 'warning', check_dir = 'check', timeout = 3600)"
echo "$SCRIPT" | ${R_BIN} --no-save
echo "$SCRIPT" | "${R_BIN}" --no-save

AFTER=$(ls -alh ~/)
if [ "$NOT_CRAN" != "true" ] && [ "$BEFORE" != "$AFTER" ]; then
Expand Down
Loading