From d022ff87ba1fc6f14ec540abd8dc00781f191ef6 Mon Sep 17 00:00:00 2001 From: Ilham Variansyah Date: Sat, 11 Apr 2026 07:11:06 +0700 Subject: [PATCH] update regtest --- .github/workflows/docker.yml | 5 ----- .github/workflows/regression_test.yml | 5 ----- test/regression/run.py | 21 ++++++++++----------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3c30e607..3505a528 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -149,11 +149,6 @@ jobs: - name: Load Docker image run: docker load -i /tmp/mcdc-image.tar - - name: Fetch regression test data - working-directory: test/regression - run: | - git clone https://github.com/mcdc-project/mcdc-regression_test_data.git - - name: Run regression tests (${{ matrix.mode }}) run: | docker run --rm \ diff --git a/.github/workflows/regression_test.yml b/.github/workflows/regression_test.yml index 760c5fbd..1932cf43 100644 --- a/.github/workflows/regression_test.yml +++ b/.github/workflows/regression_test.yml @@ -59,11 +59,6 @@ jobs: pip install -e ".[dev]" pip list - - name: Fetch regression test data - working-directory: test/regression - run: | - git clone https://github.com/mcdc-project/mcdc-regression_test_data.git - - name: Run regression tests (${{ matrix.mode }}) if: matrix.mode == 'Python-Serial' working-directory: test/regression diff --git a/test/regression/run.py b/test/regression/run.py index e71c4ef8..ab953482 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -10,7 +10,6 @@ parser.add_argument("--srun", type=int, default=0) parser.add_argument("--name", type=str, default="ALL") parser.add_argument("--skip", type=str, default="NONE") -parser.add_argument("--include_native_physics", default=False, action="store_true") args, unargs = parser.parse_known_args() # Parse @@ -20,9 +19,17 @@ srun = args.srun name = args.name skip = args.skip -include_native_physics = args.include_native_physics -non_test_files = ["__pycache__", "mcdc-regression_test_data", "tmp"] +regtest_data_name = "mcdc-regression_test_data" +non_test_files = ["__pycache__", regtest_data_name, "tmp"] + +# Clone and update regression test data if needed +if not os.path.isdir(regtest_data_name): + os.system(f"git clone https://github.com/mcdc-project/{regtest_data_name}.git") +else: + os.chdir(regtest_data_name) + os.system("git pull") + os.chdir("..") # Get test names if name == "ALL": @@ -41,14 +48,6 @@ print(Fore.YELLOW + "Note: Skipping %s" % name + Style.RESET_ALL) names.remove(name) -# Remove native physics if not incuded -native_physics_tests = ["pincell", "pincell-k_eigenvalue", "pincell-energy_deposition"] -if not include_native_physics: - for name in native_physics_tests: - print(Fore.YELLOW + "Note: Skipping %s" % name + Style.RESET_ALL) - if name in names: - names.remove(name) - # Skip domain decomp tests unless there are 4 MPI processes temp = names.copy() parallel_run = mpiexec > 0 or srun > 0