Skip to content

Commit

Permalink
Remove redundant test
Browse files Browse the repository at this point in the history
USE_STL no longer exists
  • Loading branch information
SeekyCt committed Jan 2, 2025
1 parent db54733 commit a8b9998
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
region: [eu0, eu1, us0, us1, us2, jp0, jp1, kr0]
test: [mod_ctx, old_mod_ctx, decomp_ctx, mod_ctx_shuffle, test_mod_individual]
test: [mod_ctx, decomp_ctx, mod_ctx_shuffle, test_mod_individual]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
14 changes: 4 additions & 10 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

parser = ArgumentParser()
parser.add_argument("tests", type=str, nargs="*", help="Tests to run" \
"(mod_ctx, old_mod_ctx, decomp_ctx, mod_ctx_shuffle, test_mod_individual)")
"(mod_ctx, decomp_ctx, mod_ctx_shuffle, test_mod_individual)")
parser.add_argument("--regions", type=str, nargs="+", help="Regions to test")
parser.add_argument("--seed", type=int, default=1, help="Shuffling seed")
parser.add_argument("--shuffle", type=int, default=50, help="Number of randomised orders to test")
Expand Down Expand Up @@ -231,15 +231,10 @@ def find_headers(dirname: str, base=None) -> List[str]:

return ret

# Test the headers in the spm-utils modding setup
# Test the headers in the modding setup
def test_mod_ctx(regions: List[str]):
compile_regions(os.path.join("$builddir", "{region}", "mod.o"), "$mod_source", regions,
MOD_INCLUDES, ["USE_STL"])

# Test the headers in the old modding setup
def test_old_mod_ctx(regions: List[str]):
compile_regions(os.path.join("$builddir", "{region}", "old_mod.o"), "$mod_source", regions,
MOD_INCLUDES, [])
MOD_INCLUDES, [""])

# Test the headers in the decomp setup
def test_decomp_ctx(regions: List[str]):
Expand Down Expand Up @@ -267,14 +262,13 @@ def test_mod_individual(regions: List[str]):

test_fns = {
"mod_ctx" : test_mod_ctx,
"old_mod_ctx" : test_old_mod_ctx,
"decomp_ctx" : test_decomp_ctx,
"mod_ctx_shuffle" : test_mod_ctx_shuffle,
"test_mod_individual" : test_mod_individual,
}

incgen("$mod_source", MOD_INCLUDES)
default_tests = ["mod_ctx", "old_mod_ctx"]
default_tests = ["mod_ctx"]

if args.codewarrior:
incgen("$decomp_source", DECOMP_INCLUDES)
Expand Down

0 comments on commit a8b9998

Please sign in to comment.