Skip to content

Commit d203264

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 dfa9afb commit d203264

File tree

11 files changed

+144
-105
lines changed

11 files changed

+144
-105
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);

0 commit comments

Comments
 (0)