Skip to content

Commit df9bd4c

Browse files
committed
Revise tools scripts to be python3 compatible on win32
We introduce setup_stdio function to setup stdout/stderr properly. For python <-> python pipe, we always use 'utf8'/'ignore' encoding for not lost characters. For tty <-> python, we using native encoding with xmlcharrefreplace to encode, to preserve maximal information. For python <-> native program, we use naive encoding with 'ignore' to not cause error update_exclude_list with binary mode so that on win32 would not generate \r\n run-test-suite.py: Handling skiplist properly on win32 Fixes jerryscript-project#4854 Fixes test262-harness.py complain cannot use a string pattern on a bytes-like object with running test262 with python3 For reading/writing to file, we use 'utf8' /'ignore' encoding for not lost characters. For decoding from process stdout, using native encoding with decoding error ignored for not lost data. Execute commands also ignore errors Fixes jerryscript-project#4853 Fixes running test262-esnext failed with installed python3.9 on win32 with space in path Fixes jerryscript-project#4852 support both / \ in --test262-test-list arg On win32. python tools/run-tests.py --test262-es2015=update --test262-test-list=built-ins/decodeURI/ python tools/run-tests.py --test262-es2015=update --test262-test-list=built-ins\decodeURI\ should be both valid, currently only --test262-test-list=built-ins\decodeURI\ are valid. Support snapshot-tests-skiplist.txt on win32 by use os.path.normpath Guard run-tests.py with timer. All run-tests.py are finished in 30 minutes in normal situation. May change the timeout by command line option Move Windows CI to github actions Define TERM colors for win32 properly flush stderr.write stdout.write On CI, the stderr are redirect to stdout, and if we don't flush stderr and stdout, The output from stderr/stdout would out of sync. `Testing new Date(-8640000000000000) and fixes date for win32` So that the CI can passed if sys.version_info.major >= 3: remove, as we do not support python2 anymore JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo [email protected]
1 parent ba89576 commit df9bd4c

File tree

11 files changed

+126
-93
lines changed

11 files changed

+126
-93
lines changed

.github/workflows/gh-actions.yml

+28
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,34 @@ jobs:
5656
- run: $RUNNER -q --jerry-tests --buildoptions=--compile-flag=-m32,--cpointer-32bit=on
5757
- run: $RUNNER -q --jerry-tests --buildoptions=--compile-flag=-m32,--cpointer-32bit=on --build-debug
5858

59+
Win_x86-64_Conformance_Tests_ESNext:
60+
runs-on: windows-latest
61+
steps:
62+
- uses: actions/checkout@v2
63+
- run: python $env:RUNNER --test262 update
64+
65+
Win_x86-64_Conformance_Tests_ESNext_Debug:
66+
runs-on: windows-latest
67+
steps:
68+
- uses: actions/checkout@v2
69+
- run: python $env:RUNNER --test262 update --build-debug
70+
71+
Win_x86-64_Tests:
72+
runs-on: windows-latest
73+
steps:
74+
- uses: actions/checkout@v2
75+
- run: python $env:RUNNER -q --jerry-tests
76+
- run: python $env:RUNNER -q --unittests
77+
- run: python $env:RUNNER -q --buildoption-test
78+
79+
Win_x86-64_Tests_Debug:
80+
runs-on: windows-latest
81+
steps:
82+
- uses: actions/checkout@v2
83+
- run: python $env:RUNNER -q --jerry-tests --build-debug
84+
- run: python $env:RUNNER -q --unittests --build-debug
85+
- run: python $env:RUNNER -q --buildoption-test --build-debug
86+
5987
OSX_x86-64_Build_Correctness_Unit_Tests:
6088
runs-on: macos-13
6189
steps:

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# JerryScript: JavaScript engine for the Internet of Things
33
[![License](https://img.shields.io/badge/licence-Apache%202.0-brightgreen.svg?style=flat)](LICENSE)
44
[![GitHub Actions Status](https://github.com/jerryscript-project/jerryscript/workflows/JerryScript%20CI/badge.svg)](https://github.com/jerryscript-project/jerryscript/actions)
5-
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/ct8reap35u2vooa5/branch/master?svg=true)](https://ci.appveyor.com/project/jerryscript-project/jerryscript/branch/master)
65
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fjerryscript-project%2Fjerryscript.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fjerryscript-project%2Fjerryscript?ref=badge_shield)
76
[![IRC Channel](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](https://kiwiirc.com/client/irc.freenode.net/#jerryscript)
87

appveyor.yml

-27
This file was deleted.

jerry-port/win/jerry-port-win-date.c

+17-20
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <winbase.h>
2424
#include <winnt.h>
2525

26-
#define UNIX_EPOCH_IN_TICKS 116444736000000000ull /* difference between 1970 and 1601 */
27-
#define TICKS_PER_MS 10000ull /* 1 tick is 100 nanoseconds */
26+
#define UNIX_EPOCH_IN_TICKS 116444736000000000LL /* difference between 1970 and 1601 */
27+
#define TICKS_PER_MS 10000LL /* 1 tick is 100 nanoseconds */
2828

2929
/*
3030
* If you take the limit of SYSTEMTIME (last millisecond in 30827) then you end up with
@@ -44,15 +44,9 @@
4444
* https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime
4545
*/
4646
static void
47-
unix_time_to_filetime (double t, LPFILETIME ft_p)
47+
unix_time_to_filetime (LONGLONG t, LPFILETIME ft_p)
4848
{
49-
LONGLONG ll = (LONGLONG) t * TICKS_PER_MS + UNIX_EPOCH_IN_TICKS;
50-
51-
/* FILETIME values before the epoch are invalid. */
52-
if (ll < 0)
53-
{
54-
ll = 0;
55-
}
49+
LONGLONG ll = t * TICKS_PER_MS + UNIX_EPOCH_IN_TICKS;
5650

5751
ft_p->dwLowDateTime = (DWORD) ll;
5852
ft_p->dwHighDateTime = (DWORD) (ll >> 32);
@@ -63,13 +57,15 @@ unix_time_to_filetime (double t, LPFILETIME ft_p)
6357
*
6458
* @return unix time
6559
*/
66-
static double
60+
static LONGLONG
6761
filetime_to_unix_time (LPFILETIME ft_p)
6862
{
6963
ULARGE_INTEGER date;
64+
LONGLONG ll;
7065
date.HighPart = ft_p->dwHighDateTime;
7166
date.LowPart = ft_p->dwLowDateTime;
72-
return (double) (((LONGLONG) date.QuadPart - UNIX_EPOCH_IN_TICKS) / TICKS_PER_MS);
67+
ll = date.QuadPart - UNIX_EPOCH_IN_TICKS;
68+
return ll / TICKS_PER_MS;
7369
} /* filetime_to_unix_time */
7470

7571
/**
@@ -85,6 +81,7 @@ jerry_port_local_tza (double unix_ms)
8581
FILETIME local;
8682
SYSTEMTIME utc_sys;
8783
SYSTEMTIME local_sys;
84+
LONGLONG t = (LONGLONG) (unix_ms);
8885

8986
/*
9087
* If the time is earlier than the date 1601-01-02, then always using date 1601-01-02 to
@@ -93,23 +90,23 @@ jerry_port_local_tza (double unix_ms)
9390
* after converting between local time and utc time, the time may be earlier than 1601-01-01
9491
* in UTC time, that exceeds the FILETIME representation range.
9592
*/
96-
if (unix_ms < (double) UNIX_EPOCH_DATE_1601_01_02)
93+
if (t < UNIX_EPOCH_DATE_1601_01_02)
9794
{
98-
unix_ms = (double) UNIX_EPOCH_DATE_1601_01_02;
95+
t = UNIX_EPOCH_DATE_1601_01_02;
9996
}
10097

10198
/* Like above, do not use the last supported day */
102-
if (unix_ms > (double) UNIX_EPOCH_DATE_30827_12_29)
99+
if (t > UNIX_EPOCH_DATE_30827_12_29)
103100
{
104-
unix_ms = (double) UNIX_EPOCH_DATE_30827_12_29;
101+
t = UNIX_EPOCH_DATE_30827_12_29;
105102
}
106-
unix_time_to_filetime (unix_ms, &utc);
103+
unix_time_to_filetime (t, &utc);
107104

108105
if (FileTimeToSystemTime (&utc, &utc_sys) && SystemTimeToTzSpecificLocalTime (NULL, &utc_sys, &local_sys)
109106
&& SystemTimeToFileTime (&local_sys, &local))
110107
{
111-
double unix_local = filetime_to_unix_time (&local);
112-
return (int32_t) (unix_local - unix_ms);
108+
LONGLONG unix_local = filetime_to_unix_time (&local);
109+
return (int32_t) (unix_local - t);
113110
}
114111

115112
return 0;
@@ -125,7 +122,7 @@ jerry_port_current_time (void)
125122
{
126123
FILETIME ft;
127124
GetSystemTimeAsFileTime (&ft);
128-
return filetime_to_unix_time (&ft);
125+
return (double) filetime_to_unix_time (&ft);
129126
} /* jerry_port_current_time */
130127

131128
#endif /* defined(_WIN32) */

tests/jerry/date-getters.js

+8
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,16 @@ assert (new Date(-1, -1, -1, -1, -1, -1, -1, -1).getMilliseconds() === 999);
110110
assert (isNaN(new Date(20000000, 0).getFullYear()));
111111
assert (new Date(0, 0).getFullYear() === 1900);
112112
assert (new Date(1.2, 0).getFullYear() === 1901);
113+
114+
/* 7. test case */
115+
/* A Number can exactly represent all integers from -9,007,199,254,740,992 to 9,007,199,254,740,992 (21.1.2.8 and 21.1.2.6).
116+
A time value supports a slightly smaller range of -8,640,000,000,000,000 to 8,640,000,000,000,000 milliseconds. */
113117
assert((new Date(8640000000000000).getFullYear()) == 275760);
114118
assert(isNaN(new Date(8640000000000001).getFullYear()));
119+
assert((new Date(-8640000000000000).getFullYear()) == -271821);
120+
assert(isNaN(new Date(-8640000000000001).getFullYear()));
121+
122+
/* 8. test case */
115123
assert((new Date(-271821, 3, 21).getFullYear()) == -271821);
116124
assert(isNaN(new Date(1970, 0, -100000000).getFullYear()));
117125
assert(new Date(1970, 0, -100000000 + 1).getFullYear() == -271821);

tools/run-tests.py

+29-21
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import sys
2424
import settings
2525

26-
if sys.version_info.major >= 3:
27-
from runners import util
28-
else:
29-
sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/runners')
30-
import util
26+
from runners import util
27+
from runners.util import TERM_NORMAL, TERM_YELLOW, TERM_BLUE, TERM_RED
3128

3229
OUTPUT_DIR = os.path.join(settings.PROJECT_DIR, 'build', 'tests')
3330

@@ -170,6 +167,8 @@ def get_arguments():
170167
help='Run "magic string source code generator should be executed" check')
171168
parser.add_argument('--build-debug', action='store_true',
172169
help='Build debug version jerryscript')
170+
parser.add_argument('--run-check-timeout', type=int, default=30 * 60,
171+
help='Specify run_check timeout, default to 30 minutes, unit: second')
173172
parser.add_argument('--jerry-debugger', action='store_true',
174173
help='Run jerry-debugger tests')
175174
parser.add_argument('--jerry-tests', action='store_true',
@@ -197,11 +196,6 @@ def get_arguments():
197196

198197
BINARY_CACHE = {}
199198

200-
TERM_NORMAL = '\033[0m'
201-
TERM_YELLOW = '\033[1;33m'
202-
TERM_BLUE = '\033[1;34m'
203-
TERM_RED = '\033[1;31m'
204-
205199
def report_command(cmd_type, cmd, env=None):
206200
sys.stderr.write(f'{TERM_BLUE}{cmd_type}{TERM_NORMAL}\n')
207201
if env is not None:
@@ -210,12 +204,14 @@ def report_command(cmd_type, cmd, env=None):
210204
sys.stderr.write(f"{TERM_BLUE}" +
211205
f" \\{TERM_NORMAL}\n\t{TERM_BLUE}".join(cmd) +
212206
f"{TERM_NORMAL}\n")
207+
sys.stderr.flush()
213208

214209
def report_skip(job):
215210
sys.stderr.write(f'{TERM_YELLOW}Skipping: {job.name}')
216211
if job.skip:
217212
sys.stderr.write(f' ({job.skip})')
218213
sys.stderr.write(f'{TERM_NORMAL}\n')
214+
sys.stderr.flush()
219215

220216
def create_binary(job, options):
221217
build_args = job.build_args[:]
@@ -246,6 +242,7 @@ def create_binary(job, options):
246242
if binary_key in BINARY_CACHE:
247243
ret, build_dir_path = BINARY_CACHE[binary_key]
248244
sys.stderr.write(f'(skipping: already built at {build_dir_path} with returncode {ret})\n')
245+
sys.stderr.flush()
249246
return ret, build_dir_path
250247

251248
try:
@@ -283,6 +280,7 @@ def iterate_test_runner_jobs(jobs, options):
283280

284281
if build_dir_path in tested_paths:
285282
sys.stderr.write(f'(skipping: already tested with {build_dir_path})\n')
283+
sys.stderr.flush()
286284
continue
287285
tested_paths.add(build_dir_path)
288286

@@ -291,6 +289,7 @@ def iterate_test_runner_jobs(jobs, options):
291289

292290
if bin_hash in tested_hashes:
293291
sys.stderr.write(f'(skipping: already tested with equivalent {tested_hashes[bin_hash]})\n')
292+
sys.stderr.flush()
294293
continue
295294
tested_hashes[bin_hash] = build_dir_path
296295

@@ -299,7 +298,7 @@ def iterate_test_runner_jobs(jobs, options):
299298

300299
yield job, ret_build, test_cmd
301300

302-
def run_check(runnable, env=None):
301+
def run_check(options, runnable, env=None):
303302
report_command('Test command:', runnable, env=env)
304303

305304
if env is not None:
@@ -308,7 +307,11 @@ def run_check(runnable, env=None):
308307
env = full_env
309308

310309
with subprocess.Popen(runnable, env=env) as proc:
311-
proc.wait()
310+
try:
311+
proc.wait(timeout=options.run_check_timeout)
312+
except subprocess.TimeoutExpired:
313+
proc.kill()
314+
return -1
312315
return proc.returncode
313316

314317
def run_jerry_debugger_tests(options):
@@ -335,7 +338,7 @@ def run_jerry_debugger_tests(options):
335338
if job.test_args:
336339
test_cmd.extend(job.test_args)
337340

338-
ret_test |= run_check(test_cmd)
341+
ret_test |= run_check(options, test_cmd)
339342

340343
return ret_build | ret_test
341344

@@ -367,7 +370,7 @@ def run_jerry_tests(options):
367370
if job.test_args:
368371
test_cmd.extend(job.test_args)
369372

370-
ret_test |= run_check(test_cmd, env=dict(TZ='UTC'))
373+
ret_test |= run_check(options, test_cmd, env=dict(TZ='UTC'))
371374

372375
return ret_build | ret_test
373376

@@ -397,7 +400,7 @@ def run_test262_test_suite(options):
397400
test_cmd.append('--test262-test-list')
398401
test_cmd.append(options.test262_test_list)
399402

400-
ret_test |= run_check(test_cmd, env=dict(TZ='America/Los_Angeles'))
403+
ret_test |= run_check(options, test_cmd, env=dict(TZ='America/Los_Angeles'))
401404

402405
return ret_build | ret_test
403406

@@ -422,6 +425,7 @@ def run_unittests(options):
422425

423426

424427
ret_test |= run_check(
428+
options,
425429
util.get_python_cmd_prefix() +
426430
[settings.UNITTEST_RUNNER_SCRIPT] +
427431
[os.path.join(build_dir_path, 'tests', build_config)] +
@@ -446,6 +450,7 @@ def run_buildoption_test(options):
446450
Check = collections.namedtuple('Check', ['enabled', 'runner', 'arg'])
447451

448452
def main(options):
453+
util.setup_stdio()
449454
checks = [
450455
Check(options.check_signed_off, run_check, [settings.SIGNED_OFF_SCRIPT]
451456
+ {'tolerant': ['--tolerant'], 'gh-actions': ['--gh-actions']}.get(options.check_signed_off, [])),
@@ -455,16 +460,19 @@ def main(options):
455460
Check(options.check_format, run_check, [settings.FORMAT_SCRIPT]),
456461
Check(options.check_license, run_check, [settings.LICENSE_SCRIPT]),
457462
Check(options.check_strings, run_check, [settings.STRINGS_SCRIPT]),
458-
Check(options.jerry_debugger, run_jerry_debugger_tests, options),
459-
Check(options.jerry_tests, run_jerry_tests, options),
460-
Check(options.test262, run_test262_test_suite, options),
461-
Check(options.unittests, run_unittests, options),
462-
Check(options.buildoption_test, run_buildoption_test, options),
463+
Check(options.jerry_debugger, run_jerry_debugger_tests, None),
464+
Check(options.jerry_tests, run_jerry_tests, None),
465+
Check(options.test262, run_test262_test_suite, None),
466+
Check(options.unittests, run_unittests, None),
467+
Check(options.buildoption_test, run_buildoption_test, None),
463468
]
464469

465470
for check in checks:
466471
if check.enabled or options.all:
467-
ret = check.runner(check.arg)
472+
if check.arg is None:
473+
ret = check.runner(options)
474+
else:
475+
ret = check.runner(options, check.arg)
468476
if ret:
469477
sys.exit(ret)
470478

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@
2222

2323
import util
2424

25-
def get_platform_cmd_prefix():
26-
if sys.platform == 'win32':
27-
return ['cmd', '/S', '/C']
28-
return ['python3']
29-
30-
3125
def get_arguments():
3226
execution_runtime = os.environ.get('RUNTIME', '')
3327
parser = argparse.ArgumentParser()
@@ -91,7 +85,7 @@ def update_exclude_list(args):
9185
# Tests pass in strict-mode but fail in non-strict-mode (or vice versa) should be considered as failures
9286
passing_tests = passing_tests - failing_tests
9387

94-
with open(args.excludelist_path, 'r+', encoding='utf8') as exclude_file:
88+
with open(args.excludelist_path, 'r+', encoding='utf8', errors='ignore') as exclude_file:
9589
lines = exclude_file.readlines()
9690
exclude_file.seek(0)
9791
exclude_file.truncate()
@@ -135,6 +129,7 @@ def update_exclude_list(args):
135129

136130

137131
def main(args):
132+
util.setup_stdio()
138133
return_code = prepare_test262_test_suite(args)
139134
if return_code:
140135
return return_code
@@ -149,12 +144,11 @@ def main(args):
149144
command += ' --test262-object'
150145

151146
kwargs = {}
152-
if sys.version_info.major >= 3:
153-
kwargs['errors'] = 'ignore'
147+
kwargs['errors'] = 'ignore'
154148

155149
test262_harness_path = os.path.join(args.test262_harness_dir, 'test262-harness.py')
156150

157-
test262_command = get_platform_cmd_prefix() + \
151+
test262_command = util.get_python_cmd_prefix() + \
158152
[test262_harness_path,
159153
'--command', command,
160154
'--tests', args.test_dir,

0 commit comments

Comments
 (0)