From bad8c355adfda7d39380662d0899a6bfeb6678bc Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Fri, 13 Sep 2024 18:25:44 +0900 Subject: [PATCH] Use string --- ci/scripts/integration_arrow.sh | 7 ++----- dev/archery/archery/cli.py | 5 +++-- dev/archery/archery/integration/runner.py | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ci/scripts/integration_arrow.sh b/ci/scripts/integration_arrow.sh index 1fea8e97daf94..76f210700b94c 100755 --- a/ci/scripts/integration_arrow.sh +++ b/ci/scripts/integration_arrow.sh @@ -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" @@ -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 \ diff --git a/dev/archery/archery/cli.py b/dev/archery/archery/cli.py index a89a13af68409..a4ca634efc45f 100644 --- a/dev/archery/archery/cli.py +++ b/dev/archery/archery/cli.py @@ -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, diff --git a/dev/archery/archery/integration/runner.py b/dev/archery/archery/integration/runner.py index 7877411412bf4..f0bb6368eaf89 100644 --- a/dev/archery/archery/integration/runner.py +++ b/dev/archery/archery/integration/runner.py @@ -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)