Skip to content

Commit a63e1d2

Browse files
authored
Drop legacy test262-ES2015 testing support (#4908)
ES2015 features are already covered by ES.Next tests, there is no need to run duplicated and outdated tests. JerryScript-DCO-1.0-Signed-off-by: Csaba Osztrogonác [email protected]
1 parent 077eaeb commit a63e1d2

File tree

3 files changed

+6
-52
lines changed

3 files changed

+6
-52
lines changed

.github/workflows/gh-actions.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,6 @@ jobs:
8282
- run: $RUNNER --test262
8383
- run: $RUNNER --test262 --build-debug
8484

85-
Conformance_Tests_ES2015:
86-
runs-on: ubuntu-latest
87-
steps:
88-
- uses: actions/checkout@v2
89-
- run: $RUNNER --test262-es2015=update
90-
- run: $RUNNER --test262-es2015=update --build-debug
91-
- uses: actions/upload-artifact@v2
92-
if: success() || failure()
93-
with:
94-
name: Test262-ES2015-results
95-
path: |
96-
build/tests/test262_tests_es2015/local/bin/test262.report
97-
build/tests/test262_tests_es2015-debug/local/bin/test262.report
98-
9985
Conformance_Tests_ESNext:
10086
runs-on: ubuntu-latest
10187
steps:

tools/run-tests.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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
106101
TEST262_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
]

tools/runners/run-test-suite-test262.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ def get_arguments():
4444
group = parser.add_mutually_exclusive_group(required=True)
4545
group.add_argument('--es51', action='store_true',
4646
help='Run test262 ES5.1 version')
47-
group.add_argument('--es2015', default=False, const='default',
48-
nargs='?', choices=['default', 'all', 'update'],
49-
help='Run test262 - ES2015. default: all tests except excludelist, ' +
50-
'all: all tests, update: all tests and update excludelist')
5147
group.add_argument('--esnext', default=False, const='default',
5248
nargs='?', choices=['default', 'all', 'update'],
5349
help='Run test262 - ES.next. default: all tests except excludelist, ' +
@@ -57,12 +53,7 @@ def get_arguments():
5753

5854
args = parser.parse_args()
5955

60-
if args.es2015:
61-
args.test_dir = os.path.join(args.test_dir, 'es2015')
62-
args.test262_harness_dir = os.path.abspath(os.path.dirname(__file__))
63-
args.test262_git_hash = 'fd44cd73dfbce0b515a2474b7cd505d6176a9eb5'
64-
args.excludelist_path = os.path.join('tests', 'test262-es6-excludelist.xml')
65-
elif args.esnext:
56+
if args.esnext:
6657
args.test_dir = os.path.join(args.test_dir, 'esnext')
6758
args.test262_harness_dir = os.path.abspath(os.path.dirname(__file__))
6859
args.test262_git_hash = '9f2814f00ff7612f74024c15c165853b6765c7ab'
@@ -72,7 +63,7 @@ def get_arguments():
7263
args.test262_harness_dir = args.test_dir
7364
args.test262_git_hash = 'es5-tests'
7465

75-
args.mode = args.es2015 or args.esnext
66+
args.mode = args.esnext
7667

7768
return args
7869

@@ -99,15 +90,6 @@ def prepare_test262_test_suite(args):
9990
if os.path.isdir(path_to_remove):
10091
shutil.rmtree(path_to_remove)
10192

102-
# Since ES2018 iterator's next method is called once during the prologue of iteration,
103-
# rather than during each step. The test is incorrect and stuck in an infinite loop.
104-
# https://github.com/tc39/test262/pull/1248 fixed the test and it passes on test262-esnext.
105-
if args.es2015:
106-
test_to_remove = 'test/language/statements/for-of/iterator-next-reference.js'
107-
path_to_remove = os.path.join(args.test_dir, os.path.normpath(test_to_remove))
108-
if os.path.isfile(path_to_remove):
109-
os.remove(path_to_remove)
110-
11193
return 0
11294

11395

0 commit comments

Comments
 (0)