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
5 changes: 0 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/regression_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 10 additions & 11 deletions test/regression/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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":
Expand 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
Expand Down
Loading