Skip to content

Commit

Permalink
Use string
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Sep 13, 2024
1 parent 80551c3 commit bad8c35
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
7 changes: 2 additions & 5 deletions ci/scripts/integration_arrow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration
: ${ARROW_INTEGRATION_JAVA:=ON}
: ${ARROW_INTEGRATION_JS:=ON}

: ${ARROW_INTEGRATION_TARGET_LANGUAGES:=cpp,csharp,go,java,js}

. ${arrow_dir}/ci/scripts/util_log.sh

github_actions_group_begin "Integration: Prepare: Archery"
Expand Down Expand Up @@ -63,15 +65,10 @@ time archery integration \
--run-ipc \
--run-flight \
--with-cpp=$([ "$ARROW_INTEGRATION_CPP" == "ON" ] && echo "1" || echo "0") \
--target-language=cpp \
--with-csharp=$([ "$ARROW_INTEGRATION_CSHARP" == "ON" ] && echo "1" || echo "0") \
--target-language=csharp \
--with-go=$([ "$ARROW_INTEGRATION_GO" == "ON" ] && echo "1" || echo "0") \
--target-language=go \
--with-java=$([ "$ARROW_INTEGRATION_JAVA" == "ON" ] && echo "1" || echo "0") \
--target-language=java \
--with-js=$([ "$ARROW_INTEGRATION_JS" == "ON" ] && echo "1" || echo "0") \
--target-language=js \
--gold-dirs=$gold_dir/0.14.1 \
--gold-dirs=$gold_dir/0.17.1 \
--gold-dirs=$gold_dir/1.0.0-bigendian \
Expand Down
5 changes: 3 additions & 2 deletions dev/archery/archery/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,9 @@ def _set_default(opt, default):
@click.option('--with-rust', type=bool, default=False,
help='Include Rust in integration tests',
envvar="ARCHERY_INTEGRATION_WITH_RUST")
@click.option('--target-language', multiple=True,
help=('Target languages in this integration tests'))
@click.option('--target-languages', deafult="",
help=('Target languages in this integration tests'),
envvar="ARCHERY_INTEGRATION_TARGET_LANGUAGES")
@click.option('--write_generated_json', default="",
help='Generate test JSON to indicated path')
@click.option('--run-ipc', is_flag=True, default=False,
Expand Down
3 changes: 2 additions & 1 deletion dev/archery/archery/integration/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -583,13 +583,14 @@ def get_static_json_files():
def run_all_tests(with_cpp=True, with_java=True, with_js=True,
with_csharp=True, with_go=True, with_rust=False,
with_nanoarrow=False, run_ipc=False, run_flight=False,
run_c_data=False, tempdir=None, target_languages=[],
run_c_data=False, tempdir=None, target_languages="",
**kwargs):
tempdir = tempdir or tempfile.mkdtemp(prefix='arrow-integration-')

testers: List[Tester] = []
other_testers: List[Tester] = []

target_languages = target_languages.split(",")
def append_tester(language, tester):
if len(target_languages) == 0 or language in target_languages:
testers.append(tester)
Expand Down

0 comments on commit bad8c35

Please sign in to comment.