@@ -97,11 +97,6 @@ def skip_if(condition, desc):
9797 Options ('test262_tests' , OPTIONS_PROFILE_ES51 ),
9898]
9999
100- # Test options for test262-es2015
101- TEST262_ES2015_TEST_SUITE_OPTIONS = [
102- Options ('test262_tests_es2015' , OPTIONS_PROFILE_ESNEXT + ['--line-info=on' , '--error-messages=on' ]),
103- ]
104-
105100# Test options for test262-esnext
106101TEST262_ESNEXT_TEST_SUITE_OPTIONS = [
107102 Options ('test262_tests_esnext' , OPTIONS_PROFILE_ESNEXT
@@ -199,10 +194,6 @@ def get_arguments():
199194 help = 'Run jerry-tests' )
200195 parser .add_argument ('--test262' , action = 'store_true' ,
201196 help = 'Run test262 - ES5.1' )
202- parser .add_argument ('--test262-es2015' , default = False , const = 'default' ,
203- nargs = '?' , choices = ['default' , 'all' , 'update' ],
204- help = 'Run test262 - ES2015. default: all tests except excludelist, ' +
205- 'all: all tests, update: all tests and update excludelist' )
206197 parser .add_argument ('--test262-esnext' , default = False , const = 'default' ,
207198 nargs = '?' , choices = ['default' , 'all' , 'update' ],
208199 help = 'Run test262 - ESnext. default: all tests except excludelist, ' +
@@ -223,8 +214,8 @@ def get_arguments():
223214 script_args = parser .parse_args ()
224215
225216 if script_args .test262_test_list and not \
226- (script_args .test262 or script_args .test262_es2015 or script_args . test262_esnext ):
227- print ("--test262-test-list is only allowed with --test262 or --test262-es2015 or --test262- esnext\n " )
217+ (script_args .test262 or script_args .test262_esnext ):
218+ print ("--test262-test-list is only allowed with --test262 or --test262-esnext\n " )
228219 parser .print_help ()
229220 sys .exit (1 )
230221
@@ -412,8 +403,6 @@ def run_test262_test_suite(options):
412403 jobs = []
413404 if options .test262 :
414405 jobs .extend (TEST262_TEST_SUITE_OPTIONS )
415- if options .test262_es2015 :
416- jobs .extend (TEST262_ES2015_TEST_SUITE_OPTIONS )
417406 if options .test262_esnext :
418407 jobs .extend (TEST262_ESNEXT_TEST_SUITE_OPTIONS )
419408
@@ -430,10 +419,7 @@ def run_test262_test_suite(options):
430419 '--test-dir' , settings .TEST262_TEST_SUITE_DIR
431420 ]
432421
433- if job .name .endswith ('es2015' ):
434- test_cmd .append ('--es2015' )
435- test_cmd .append (options .test262_es2015 )
436- elif job .name .endswith ('esnext' ):
422+ if job .name .endswith ('esnext' ):
437423 test_cmd .append ('--esnext' )
438424 test_cmd .append (options .test262_esnext )
439425 else :
@@ -506,7 +492,7 @@ def main(options):
506492 Check (options .check_strings , run_check , [settings .STRINGS_SCRIPT ]),
507493 Check (options .jerry_debugger , run_jerry_debugger_tests , options ),
508494 Check (options .jerry_tests , run_jerry_tests , options ),
509- Check (options .test262 or options .test262_es2015 or options . test262_esnext , run_test262_test_suite , options ),
495+ Check (options .test262 or options .test262_esnext , run_test262_test_suite , options ),
510496 Check (options .unittests , run_unittests , options ),
511497 Check (options .buildoption_test , run_buildoption_test , options ),
512498 ]
0 commit comments