Skip to content

Commit

Permalink
Revise tools scripts to be python3 compatible on win32
Browse files Browse the repository at this point in the history
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 luoyonggang@gmail.com
  • Loading branch information
lygstate committed Dec 7, 2024
1 parent 23f30e3 commit 9b5ec65
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 93 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/gh-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,34 @@ jobs:
- run: $RUNNER -q --jerry-tests --buildoptions=--compile-flag=-m32,--cpointer-32bit=on
- run: $RUNNER -q --jerry-tests --buildoptions=--compile-flag=-m32,--cpointer-32bit=on --build-debug

Win_x86-64_Conformance_Tests_ESNext:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER --test262 update

Win_x86-64_Conformance_Tests_ESNext_Debug:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER --test262 update --build-debug

Win_x86-64_Tests:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER -q --jerry-tests
- run: python $env:RUNNER -q --unittests
- run: python $env:RUNNER -q --buildoption-test

Win_x86-64_Tests_Debug:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: python $env:RUNNER -q --jerry-tests --build-debug
- run: python $env:RUNNER -q --unittests --build-debug
- run: python $env:RUNNER -q --buildoption-test --build-debug

OSX_x86-64_Build_Correctness_Unit_Tests:
runs-on: macos-13
steps:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# JerryScript: JavaScript engine for the Internet of Things
[![License](https://img.shields.io/badge/licence-Apache%202.0-brightgreen.svg?style=flat)](LICENSE)
[![GitHub Actions Status](https://github.com/jerryscript-project/jerryscript/workflows/JerryScript%20CI/badge.svg)](https://github.com/jerryscript-project/jerryscript/actions)
[![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)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgh.neting.cc%2Fjerryscript-project%2Fjerryscript.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgh.neting.cc%2Fjerryscript-project%2Fjerryscript?ref=badge_shield)
[![IRC Channel](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](https://kiwiirc.com/client/irc.freenode.net/#jerryscript)

Expand Down
27 changes: 0 additions & 27 deletions appveyor.yml

This file was deleted.

37 changes: 17 additions & 20 deletions jerry-port/win/jerry-port-win-date.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <winbase.h>
#include <winnt.h>

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

/*
* If you take the limit of SYSTEMTIME (last millisecond in 30827) then you end up with
Expand All @@ -44,15 +44,9 @@
* https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime
*/
static void
unix_time_to_filetime (double t, LPFILETIME ft_p)
unix_time_to_filetime (LONGLONG t, LPFILETIME ft_p)
{
LONGLONG ll = (LONGLONG) t * TICKS_PER_MS + UNIX_EPOCH_IN_TICKS;

/* FILETIME values before the epoch are invalid. */
if (ll < 0)
{
ll = 0;
}
LONGLONG ll = t * TICKS_PER_MS + UNIX_EPOCH_IN_TICKS;

ft_p->dwLowDateTime = (DWORD) ll;
ft_p->dwHighDateTime = (DWORD) (ll >> 32);
Expand All @@ -63,13 +57,15 @@ unix_time_to_filetime (double t, LPFILETIME ft_p)
*
* @return unix time
*/
static double
static LONGLONG
filetime_to_unix_time (LPFILETIME ft_p)
{
ULARGE_INTEGER date;
LONGLONG ll;
date.HighPart = ft_p->dwHighDateTime;
date.LowPart = ft_p->dwLowDateTime;
return (double) (((LONGLONG) date.QuadPart - UNIX_EPOCH_IN_TICKS) / TICKS_PER_MS);
ll = date.QuadPart - UNIX_EPOCH_IN_TICKS;
return ll / TICKS_PER_MS;
} /* filetime_to_unix_time */

/**
Expand All @@ -85,6 +81,7 @@ jerry_port_local_tza (double unix_ms)
FILETIME local;
SYSTEMTIME utc_sys;
SYSTEMTIME local_sys;
LONGLONG t = (LONGLONG) (unix_ms);

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

/* Like above, do not use the last supported day */
if (unix_ms > (double) UNIX_EPOCH_DATE_30827_12_29)
if (t > UNIX_EPOCH_DATE_30827_12_29)
{
unix_ms = (double) UNIX_EPOCH_DATE_30827_12_29;
t = UNIX_EPOCH_DATE_30827_12_29;
}
unix_time_to_filetime (unix_ms, &utc);
unix_time_to_filetime (t, &utc);

if (FileTimeToSystemTime (&utc, &utc_sys) && SystemTimeToTzSpecificLocalTime (NULL, &utc_sys, &local_sys)
&& SystemTimeToFileTime (&local_sys, &local))
{
double unix_local = filetime_to_unix_time (&local);
return (int32_t) (unix_local - unix_ms);
LONGLONG unix_local = filetime_to_unix_time (&local);
return (int32_t) (unix_local - t);
}

return 0;
Expand All @@ -125,7 +122,7 @@ jerry_port_current_time (void)
{
FILETIME ft;
GetSystemTimeAsFileTime (&ft);
return filetime_to_unix_time (&ft);
return (double) filetime_to_unix_time (&ft);
} /* jerry_port_current_time */

#endif /* defined(_WIN32) */
8 changes: 8 additions & 0 deletions tests/jerry/date-getters.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,16 @@ assert (new Date(-1, -1, -1, -1, -1, -1, -1, -1).getMilliseconds() === 999);
assert (isNaN(new Date(20000000, 0).getFullYear()));
assert (new Date(0, 0).getFullYear() === 1900);
assert (new Date(1.2, 0).getFullYear() === 1901);

/* 7. test case */
/* 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).
A time value supports a slightly smaller range of -8,640,000,000,000,000 to 8,640,000,000,000,000 milliseconds. */
assert((new Date(8640000000000000).getFullYear()) == 275760);
assert(isNaN(new Date(8640000000000001).getFullYear()));
assert((new Date(-8640000000000000).getFullYear()) == -271821);
assert(isNaN(new Date(-8640000000000001).getFullYear()));

/* 8. test case */
assert((new Date(-271821, 3, 21).getFullYear()) == -271821);
assert(isNaN(new Date(1970, 0, -100000000).getFullYear()));
assert(new Date(1970, 0, -100000000 + 1).getFullYear() == -271821);
Expand Down
50 changes: 29 additions & 21 deletions tools/run-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@
import sys
import settings

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

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

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

BINARY_CACHE = {}

TERM_NORMAL = '\033[0m'
TERM_YELLOW = '\033[1;33m'
TERM_BLUE = '\033[1;34m'
TERM_RED = '\033[1;31m'

def report_command(cmd_type, cmd, env=None):
sys.stderr.write(f'{TERM_BLUE}{cmd_type}{TERM_NORMAL}\n')
if env is not None:
Expand All @@ -210,12 +204,14 @@ def report_command(cmd_type, cmd, env=None):
sys.stderr.write(f"{TERM_BLUE}" +
f" \\{TERM_NORMAL}\n\t{TERM_BLUE}".join(cmd) +
f"{TERM_NORMAL}\n")
sys.stderr.flush()

def report_skip(job):
sys.stderr.write(f'{TERM_YELLOW}Skipping: {job.name}')
if job.skip:
sys.stderr.write(f' ({job.skip})')
sys.stderr.write(f'{TERM_NORMAL}\n')
sys.stderr.flush()

def create_binary(job, options):
build_args = job.build_args[:]
Expand Down Expand Up @@ -246,6 +242,7 @@ def create_binary(job, options):
if binary_key in BINARY_CACHE:
ret, build_dir_path = BINARY_CACHE[binary_key]
sys.stderr.write(f'(skipping: already built at {build_dir_path} with returncode {ret})\n')
sys.stderr.flush()
return ret, build_dir_path

try:
Expand Down Expand Up @@ -283,6 +280,7 @@ def iterate_test_runner_jobs(jobs, options):

if build_dir_path in tested_paths:
sys.stderr.write(f'(skipping: already tested with {build_dir_path})\n')
sys.stderr.flush()
continue
tested_paths.add(build_dir_path)

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

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

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

yield job, ret_build, test_cmd

def run_check(runnable, env=None):
def run_check(options, runnable, env=None):
report_command('Test command:', runnable, env=env)

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

with subprocess.Popen(runnable, env=env) as proc:
proc.wait()
try:
proc.wait(timeout=options.run_check_timeout)
except subprocess.TimeoutExpired:
proc.kill()
return -1
return proc.returncode

def run_jerry_debugger_tests(options):
Expand All @@ -335,7 +338,7 @@ def run_jerry_debugger_tests(options):
if job.test_args:
test_cmd.extend(job.test_args)

ret_test |= run_check(test_cmd)
ret_test |= run_check(options, test_cmd)

return ret_build | ret_test

Expand Down Expand Up @@ -367,7 +370,7 @@ def run_jerry_tests(options):
if job.test_args:
test_cmd.extend(job.test_args)

ret_test |= run_check(test_cmd, env=dict(TZ='UTC'))
ret_test |= run_check(options, test_cmd, env=dict(TZ='UTC'))

return ret_build | ret_test

Expand Down Expand Up @@ -397,7 +400,7 @@ def run_test262_test_suite(options):
test_cmd.append('--test262-test-list')
test_cmd.append(options.test262_test_list)

ret_test |= run_check(test_cmd, env=dict(TZ='America/Los_Angeles'))
ret_test |= run_check(options, test_cmd, env=dict(TZ='America/Los_Angeles'))

return ret_build | ret_test

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


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

def main(options):
util.setup_stdio()
checks = [
Check(options.check_signed_off, run_check, [settings.SIGNED_OFF_SCRIPT]
+ {'tolerant': ['--tolerant'], 'gh-actions': ['--gh-actions']}.get(options.check_signed_off, [])),
Expand All @@ -455,16 +460,19 @@ def main(options):
Check(options.check_format, run_check, [settings.FORMAT_SCRIPT]),
Check(options.check_license, run_check, [settings.LICENSE_SCRIPT]),
Check(options.check_strings, run_check, [settings.STRINGS_SCRIPT]),
Check(options.jerry_debugger, run_jerry_debugger_tests, options),
Check(options.jerry_tests, run_jerry_tests, options),
Check(options.test262, run_test262_test_suite, options),
Check(options.unittests, run_unittests, options),
Check(options.buildoption_test, run_buildoption_test, options),
Check(options.jerry_debugger, run_jerry_debugger_tests, None),
Check(options.jerry_tests, run_jerry_tests, None),
Check(options.test262, run_test262_test_suite, None),
Check(options.unittests, run_unittests, None),
Check(options.buildoption_test, run_buildoption_test, None),
]

for check in checks:
if check.enabled or options.all:
ret = check.runner(check.arg)
if check.arg is None:
ret = check.runner(options)
else:
ret = check.runner(options, check.arg)
if ret:
sys.exit(ret)

Expand Down
14 changes: 4 additions & 10 deletions tools/runners/run-test-suite-test262.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@

import util

def get_platform_cmd_prefix():
if sys.platform == 'win32':
return ['cmd', '/S', '/C']
return ['python3']


def get_arguments():
execution_runtime = os.environ.get('RUNTIME', '')
parser = argparse.ArgumentParser()
Expand Down Expand Up @@ -91,7 +85,7 @@ def update_exclude_list(args):
# Tests pass in strict-mode but fail in non-strict-mode (or vice versa) should be considered as failures
passing_tests = passing_tests - failing_tests

with open(args.excludelist_path, 'r+', encoding='utf8') as exclude_file:
with open(args.excludelist_path, 'r+', encoding='utf8', errors='ignore') as exclude_file:
lines = exclude_file.readlines()
exclude_file.seek(0)
exclude_file.truncate()
Expand Down Expand Up @@ -135,6 +129,7 @@ def update_exclude_list(args):


def main(args):
util.setup_stdio()
return_code = prepare_test262_test_suite(args)
if return_code:
return return_code
Expand All @@ -149,12 +144,11 @@ def main(args):
command += ' --test262-object'

kwargs = {}
if sys.version_info.major >= 3:
kwargs['errors'] = 'ignore'
kwargs['errors'] = 'ignore'

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

test262_command = get_platform_cmd_prefix() + \
test262_command = util.get_python_cmd_prefix() + \
[test262_harness_path,
'--command', command,
'--tests', args.test_dir,
Expand Down
Loading

0 comments on commit 9b5ec65

Please sign in to comment.