test: update tests

Author: boriel

src/zxbc/args_config.py

@@ -91,7 +91,6 @@ def parse_options(args: list[str] | None = None) -> Namespace:
     if OPTIONS.sinclair:
         OPTIONS.array_base = 1
         OPTIONS.string_base = 1
-        OPTIONS.strict_bool = True
         OPTIONS.case_insensitive = True
 
     OPTIONS.case_insensitive = options.ignore_case

tests/api/test_config.py

@@ -38,6 +38,7 @@ def test_init(self):
         self.assertEqual(config.OPTIONS.emit_backend, False)
         self.assertIsNone(config.OPTIONS.architecture)
         self.assertEqual(config.OPTIONS.expected_warnings, 0)
+        self.assertEqual(config.OPTIONS.opt_strategy, "auto")
 
         # private options that cannot be accessed with #pragma
         self.assertEqual(config.OPTIONS["__DEFINES"].value, {})
@@ -46,44 +47,42 @@ def test_init(self):
         self.assertEqual(config.OPTIONS.strict, False)
 
     def test_initted_values(self):
-        self.assertEqual(
-            sorted(config.OPTIONS._options.keys()),
-            [
-                "__DEFINES",
-                config.OPTION.ARCH,
-                config.OPTION.ARRAY_BASE,
-                config.OPTION.CHECK_ARRAYS,
-                config.OPTION.AUTORUN,
-                config.OPTION.CASE_INS,
-                config.OPTION.DEBUG,
-                config.OPTION.DEFAULT_BYREF,
-                config.OPTION.EMIT_BACKEND,
-                config.OPTION.ENABLE_BREAK,
-                config.OPTION.EXPECTED_WARNINGS,
-                config.OPTION.EXPLICIT,
-                config.OPTION.FORCE_ASM_BRACKET,
-                config.OPTION.HIDE_WARNING_CODES,
-                config.OPTION.INCLUDE_PATH,
-                config.OPTION.INPUT_FILENAME,
-                config.OPTION.MAX_SYN_ERRORS,
-                config.OPTION.CHECK_MEMORY,
-                config.OPTION.MEMORY_MAP,
-                config.OPTION.O_LEVEL,
-                config.OPTION.OUTPUT_FILE_TYPE,
-                config.OPTION.OUTPUT_FILENAME,
-                "project_filename",
-                "sinclair",
-                config.OPTION.STDERR,
-                config.OPTION.STDERR_FILENAME,
-                config.OPTION.STDIN,
-                config.OPTION.STDOUT,
-                config.OPTION.STRICT,
-                config.OPTION.STRICT_BOOL,
-                config.OPTION.STR_BASE,
-                config.OPTION.USE_BASIC_LOADER,
-                config.OPTION.ASM_ZXNEXT,
-            ],
-        )
+        assert sorted(config.OPTIONS._options.keys()) == [
+            "__DEFINES",
+            config.OPTION.ARCH,
+            config.OPTION.ARRAY_BASE,
+            config.OPTION.CHECK_ARRAYS,
+            config.OPTION.AUTORUN,
+            config.OPTION.CASE_INS,
+            config.OPTION.DEBUG,
+            config.OPTION.DEFAULT_BYREF,
+            config.OPTION.EMIT_BACKEND,
+            config.OPTION.ENABLE_BREAK,
+            config.OPTION.EXPECTED_WARNINGS,
+            config.OPTION.EXPLICIT,
+            config.OPTION.FORCE_ASM_BRACKET,
+            config.OPTION.HIDE_WARNING_CODES,
+            config.OPTION.INCLUDE_PATH,
+            config.OPTION.INPUT_FILENAME,
+            config.OPTION.MAX_SYN_ERRORS,
+            config.OPTION.CHECK_MEMORY,
+            config.OPTION.MEMORY_MAP,
+            config.OPTION.OPT_STRATEGY,
+            config.OPTION.O_LEVEL,
+            config.OPTION.OUTPUT_FILE_TYPE,
+            config.OPTION.OUTPUT_FILENAME,
+            "project_filename",
+            "sinclair",
+            config.OPTION.STDERR,
+            config.OPTION.STDERR_FILENAME,
+            config.OPTION.STDIN,
+            config.OPTION.STDOUT,
+            config.OPTION.STRICT,
+            config.OPTION.STRICT_BOOL,
+            config.OPTION.STR_BASE,
+            config.OPTION.USE_BASIC_LOADER,
+            config.OPTION.ASM_ZXNEXT,
+        ]
 
     def test_loader_ignore_none(self):
         """Some settings must ignore "None" assignments, since

tests/arch/zx48k/optimizer/test_o1_optimizer.py

@@ -23,7 +23,4 @@ def test_call_match(self):
             self.backend._output_join(output, code, optimize=True)
             assert output == [
                 "call .core.__LEI8",
-                "sub 1",
-                "sbc a, a",
-                "inc a",
             ]

tests/functional/cmdline/test_cmdline.txt

@@ -3,9 +3,9 @@
 >>> os.environ['COLUMNS'] = '80'
 
 >>> process_file('arch/zx48k/arrbase1.bas', ['-q', '-S', '-O --mmap arrbase1.map'])
-usage: zxbc.py [-h] [-d] [-O OPTIMIZE] [-o OUTPUT_FILE] [-T] [-t] [-A] [-E]
-               [--parse-only] [-f {asm,bin,ir,sna,tap,tzx,z80}] [-B] [-a]
-               [-S ORG] [-e STDERR] [--array-base ARRAY_BASE]
+usage: zxbc.py [-h] [-d] [-O OPTIMIZE] [-o OUTPUT_FILE]
+               [-T | -t | -A | -E | --parse-only | -f {asm,bin,ir,sna,tap,tzx,z80}]
+               [-B] [-a] [-S ORG] [-e STDERR] [--array-base ARRAY_BASE]
                [--string-base STRING_BASE] [-Z] [-H HEAP_SIZE]
                [--heap-address HEAP_ADDRESS] [--debug-memory] [--debug-array]
                [--strict-bool] [--enable-break] [--explicit] [-D DEFINES]
@@ -15,6 +15,7 @@ usage: zxbc.py [-h] [-d] [-O OPTIMIZE] [-o OUTPUT_FILE] [-T] [-t] [-A] [-E]
                [--arch ARCH] [--expect-warnings EXPECT_WARNINGS]
                [-W DISABLE_WARNING] [+W ENABLE_WARNING] [--hide-warning-codes]
                [-F CONFIG_FILE] [--save-config SAVE_CONFIG]
+               [--opt-strategy {size,speed,auto}]
                PROGRAM
 zxbc.py: error: Option --asm and --mmap cannot be used together