@@ -79,14 +79,7 @@ def main() -> None:
7979 default = None ,
8080 type = str ,
8181 metavar = "PATH" ,
82- help = "output the per-file result of the non-bytecode run to this file" ,
83- )
84- parser .add_argument (
85- "--per-file-bytecode-output" ,
86- default = None ,
87- type = str ,
88- metavar = "PATH" ,
89- help = "output the per-file result of the bytecode run to this file" ,
82+ help = "output the per-file result to this file" ,
9083 )
9184 args = parser .parse_args ()
9285
@@ -143,7 +136,7 @@ def main() -> None:
143136 )
144137 test_js_results = test_js_output ["results" ]["tests" ]
145138
146- print ("Running test262 with the AST interpreter ..." )
139+ print ("Running test262..." )
147140 libjs_test262_output = json .loads (
148141 # This is not the way, but I can't be bothered to import this stuff. :^)
149142 run_command (
@@ -160,23 +153,6 @@ def main() -> None:
160153 )
161154 libjs_test262_results = libjs_test262_output ["results" ]["test" ]["results" ]
162155
163- print ("Running test262 with the bytecode interpreter..." )
164- libjs_test262_bc_output = json .loads (
165- # This is not the way either, but I can't be bothered to fix the one above and _then_ copy it. :^)
166- run_command (
167- f"python3 { libjs_test262_main_py } "
168- f"--libjs-test262-runner { libjs_test262_runner } "
169- f"--test262 { test262 } "
170- "--silent --summary --json --use-bytecode "
171- + (
172- ""
173- if args .per_file_bytecode_output is None
174- else f"--per-file { args .per_file_bytecode_output } "
175- )
176- )
177- )
178- libjs_test262_bc_results = libjs_test262_bc_output ["results" ]["test" ]["results" ]
179-
180156 result = {
181157 "commit_timestamp" : commit_timestamp ,
182158 "run_timestamp" : run_timestamp ,
@@ -187,7 +163,7 @@ def main() -> None:
187163 "test262-parser-tests" : version_test262_parser_tests ,
188164 },
189165 "tests" : {
190- "test262" : {
166+ "test262-bytecode " : {
191167 "duration" : libjs_test262_output ["duration" ],
192168 "results" : {
193169 "total" : libjs_test262_output ["results" ]["test" ]["count" ],
@@ -202,21 +178,6 @@ def main() -> None:
202178 "todo_error" : libjs_test262_results ["TODO_ERROR" ],
203179 },
204180 },
205- "test262-bytecode" : {
206- "duration" : libjs_test262_bc_output ["duration" ],
207- "results" : {
208- "total" : libjs_test262_bc_output ["results" ]["test" ]["count" ],
209- "passed" : libjs_test262_bc_results ["PASSED" ],
210- "failed" : libjs_test262_bc_results ["FAILED" ],
211- "skipped" : libjs_test262_bc_results ["SKIPPED" ],
212- "metadata_error" : libjs_test262_bc_results ["METADATA_ERROR" ],
213- "harness_error" : libjs_test262_bc_results ["HARNESS_ERROR" ],
214- "timeout_error" : libjs_test262_bc_results ["TIMEOUT_ERROR" ],
215- "process_error" : libjs_test262_bc_results ["PROCESS_ERROR" ],
216- "runner_exception" : libjs_test262_bc_results ["RUNNER_EXCEPTION" ],
217- "todo_error" : libjs_test262_bc_results ["TODO_ERROR" ],
218- },
219- },
220181 "test262-parser-tests" : {
221182 "duration" : test_js_output ["duration" ],
222183 "results" : {
0 commit comments