From 69fc86805f8873b84b802bccabdbef9ed85bfc29 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 14:52:46 -0400 Subject: [PATCH 1/7] Extract platform-independent tests into env var --- .github/workflows/ci.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bd3f1ad15d..d376089870 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,6 +17,9 @@ env: -p rustpython-jit -p rustpython-derive -p rustpython + PLATFORM_INDEPENDENT_TESTS: >- + test_argparse test_json test_bytes test_long test_unicode test_array + test_asyncgen test_list test_complex test_json test_set test_dis test_calendar jobs: rust_tests: @@ -145,20 +148,14 @@ jobs: - if: runner.os == 'Linux' name: run cpython platform-independent tests run: - target/release/rustpython -m test -v - test_argparse test_json test_bytes test_long test_unicode test_array - test_asyncgen test_list test_complex test_json test_set test_dis test_calendar + target/release/rustpython -m test -v ${{ env.PLATFORM_INDEPENDENT_TESTS }} - if: runner.os != 'Windows' name: run cpython platform-dependent tests - run: target/release/rustpython -m test -v -x - test_argparse test_json test_bytes test_long test_unicode test_array - test_asyncgen test_list test_complex test_json test_set test_dis test_calendar + run: target/release/rustpython -m test -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }} - if: runner.os == 'Windows' name: run cpython platform-dependent tests (windows partial - fixme) run: - target/release/rustpython -m test -v -x - test_argparse test_json test_bytes test_long test_unicode test_array - test_asyncgen test_list test_complex test_json test_set test_dis test_calendar + target/release/rustpython -m test -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }} test_pwd test_bool test_cgi test_exception_hierarchy test_glob test_iter test_os test_pathlib test_py_compile test_set test_shutil test_sys test_unittest test_venv test_zipimport test_importlib test_io - if: runner.os == 'Linux' From 5f908df5a8322d88d6eaa25fbc2d1acdd4d7c230 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 14:54:31 -0400 Subject: [PATCH 2/7] Separate platform-independent tests into lines --- .github/workflows/ci.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d376089870..378f318c5f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,8 +18,19 @@ env: -p rustpython-derive -p rustpython PLATFORM_INDEPENDENT_TESTS: >- - test_argparse test_json test_bytes test_long test_unicode test_array - test_asyncgen test_list test_complex test_json test_set test_dis test_calendar + test_argparse + test_json + test_bytes + test_long + test_unicode + test_array + test_asyncgen + test_list + test_complex + test_json + test_set + test_dis + test_calendar jobs: rust_tests: From 6bb576a635a2e36ed69bd1c1f408c53b28513af2 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 14:55:35 -0400 Subject: [PATCH 3/7] Sort platform-independent tests alphabetically --- .github/workflows/ci.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 378f318c5f..c9fd7f0550 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,18 +19,18 @@ env: -p rustpython PLATFORM_INDEPENDENT_TESTS: >- test_argparse - test_json - test_bytes - test_long - test_unicode test_array test_asyncgen - test_list - test_complex - test_json - test_set - test_dis + test_bytes test_calendar + test_complex + test_dis + test_json + test_json + test_list + test_long + test_set + test_unicode jobs: rust_tests: From 70bc0b47abc6266cebdaf8bf6c455b93eb7041b4 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 14:55:56 -0400 Subject: [PATCH 4/7] Deduplicate `test_json` --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c9fd7f0550..5ad6ae9b52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,7 +26,6 @@ env: test_complex test_dis test_json - test_json test_list test_long test_set From e330ad82614ded47fab686d9fed5d232892dfcd0 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 14:59:08 -0400 Subject: [PATCH 5/7] Separate Windows-only test skips into lines --- .github/workflows/ci.yaml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5ad6ae9b52..b9ee405b59 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -166,8 +166,23 @@ jobs: name: run cpython platform-dependent tests (windows partial - fixme) run: target/release/rustpython -m test -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }} - test_pwd test_bool test_cgi test_exception_hierarchy test_glob test_iter test_os test_pathlib - test_py_compile test_set test_shutil test_sys test_unittest test_venv test_zipimport test_importlib test_io + test_pwd + test_bool + test_cgi + test_exception_hierarchy + test_glob + test_iter + test_os + test_pathlib + test_py_compile + test_set + test_shutil + test_sys + test_unittest + test_venv + test_zipimport + test_importlib + test_io - if: runner.os == 'Linux' name: check that --install-pip succeeds run: | From 082be10a9579af9442614565ec67f44083c8f7cf Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 14:59:35 -0400 Subject: [PATCH 6/7] Sort Windows-only test skips --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b9ee405b59..39b5a6fcd9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -166,14 +166,16 @@ jobs: name: run cpython platform-dependent tests (windows partial - fixme) run: target/release/rustpython -m test -v -x ${{ env.PLATFORM_INDEPENDENT_TESTS }} - test_pwd test_bool test_cgi test_exception_hierarchy test_glob + test_importlib + test_io test_iter test_os test_pathlib + test_pwd test_py_compile test_set test_shutil @@ -181,8 +183,6 @@ jobs: test_unittest test_venv test_zipimport - test_importlib - test_io - if: runner.os == 'Linux' name: check that --install-pip succeeds run: | From 51b16d3ef750345e875fd274e6d843a7897d2f60 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Sat, 16 Oct 2021 15:00:38 -0400 Subject: [PATCH 7/7] Deduplicate `test_set` --- .github/workflows/ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 39b5a6fcd9..3b4292ba61 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -177,7 +177,6 @@ jobs: test_pathlib test_pwd test_py_compile - test_set test_shutil test_sys test_unittest