Skip to content

Commit a8b9998

Browse files
committed
Remove redundant test
USE_STL no longer exists
1 parent db54733 commit a8b9998

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
region: [eu0, eu1, us0, us1, us2, jp0, jp1, kr0]
15-
test: [mod_ctx, old_mod_ctx, decomp_ctx, mod_ctx_shuffle, test_mod_individual]
15+
test: [mod_ctx, decomp_ctx, mod_ctx_shuffle, test_mod_individual]
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v3

configure.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

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

232232
return ret
233233

234-
# Test the headers in the spm-utils modding setup
234+
# Test the headers in the modding setup
235235
def test_mod_ctx(regions: List[str]):
236236
compile_regions(os.path.join("$builddir", "{region}", "mod.o"), "$mod_source", regions,
237-
MOD_INCLUDES, ["USE_STL"])
238-
239-
# Test the headers in the old modding setup
240-
def test_old_mod_ctx(regions: List[str]):
241-
compile_regions(os.path.join("$builddir", "{region}", "old_mod.o"), "$mod_source", regions,
242-
MOD_INCLUDES, [])
237+
MOD_INCLUDES, [""])
243238

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

268263
test_fns = {
269264
"mod_ctx" : test_mod_ctx,
270-
"old_mod_ctx" : test_old_mod_ctx,
271265
"decomp_ctx" : test_decomp_ctx,
272266
"mod_ctx_shuffle" : test_mod_ctx_shuffle,
273267
"test_mod_individual" : test_mod_individual,
274268
}
275269

276270
incgen("$mod_source", MOD_INCLUDES)
277-
default_tests = ["mod_ctx", "old_mod_ctx"]
271+
default_tests = ["mod_ctx"]
278272

279273
if args.codewarrior:
280274
incgen("$decomp_source", DECOMP_INCLUDES)

0 commit comments

Comments
 (0)