Skip to content

Commit f5379af

Browse files
authored
Unpin v8 version (#17521)
This reverts commit 54d1aa0. Now https://bugs.chromium.org/p/v8/issues/detail?id=12983 seems to be fixed, so we can unpin this. This also disables a few stack switching tests because of recent V8 API changes, which we will address separately. See #17532. Fixes #17278.
1 parent d5ca9bb commit f5379af

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.circleci/config.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ executors:
1717
EMTEST_WASI_SYSROOT: "~/wasi-sdk/wasi-sysroot"
1818
EMTEST_BUILD_VERBOSE: "2"
1919
EMTEST_DETECT_TEMPFILE_LEAKS: "1"
20-
# Currently pinned to 10.5.35 due to https://github.com/emscripten-core/emscripten/issues/17278
21-
V8_VERSION: "10.5.35"
2220
mac:
2321
environment:
2422
EMSDK_NOTTY: "1"
@@ -84,7 +82,7 @@ commands:
8482
# as a "bleeding edge" shell here, basically, with node being the
8583
# primary shell (which we run without any special flags)
8684
# Refer to commit 0bc3640 if we need to pin V8 version.
87-
echo "V8_ENGINE = [os.path.expanduser('~/.jsvu/v8-${V8_VERSION}'), '--wasm-staging']" >> .emscripten
85+
echo "V8_ENGINE = [os.path.expanduser('~/.jsvu/v8'), '--wasm-staging']" >> .emscripten
8886
echo "JS_ENGINES = [NODE_JS]" >> .emscripten
8987
echo "if os.path.exists(V8_ENGINE[0]): JS_ENGINES.append(V8_ENGINE)" >> .emscripten
9088
echo "WASM_ENGINES = []" >> .emscripten
@@ -346,8 +344,7 @@ jobs:
346344
export PATH="`pwd`/node-v12.13.0-linux-x64/bin:${PATH}"
347345
npm install jsvu -g
348346
export PATH="${HOME}/.jsvu:${PATH}"
349-
jsvu --os=default --engines=v8 v8@${V8_VERSION}
350-
347+
jsvu --os=default --engines=v8
351348
- build
352349
- build-libs-and-freeze
353350
- persist

test/test_core.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7963,6 +7963,8 @@ def test_vswprintf_utf8(self):
79637963
@no_wasm64('TODO: asyncify for wasm64')
79647964
@with_asyncify_and_stack_switching
79657965
def test_async_hello(self):
7966+
if self.get_setting('ASYNCIFY') == 2:
7967+
self.skipTest('https://github.com/emscripten-core/emscripten/issues/17532')
79667968
# needs to flush stdio streams
79677969
self.set_setting('EXIT_RUNTIME')
79687970

test/test_other.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12234,6 +12234,7 @@ def test_multiple_g_flags(self):
1223412234
self.assertNotIn(b'.debug', read_binary('hello_world.o'))
1223512235

1223612236
@requires_v8
12237+
@disabled('https://github.com/emscripten-core/emscripten/issues/17532')
1223712238
def test_stack_switching_size(self):
1223812239
# use iostream code here to purposefully get a fairly large wasm file, so
1223912240
# that our size comparisons later are meaningful

0 commit comments

Comments
 (0)