Skip to content

Cleanup test_separate_metadata_later browser test. NFC #27033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbc100 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Cleanup test_separate_metadata_later browser test. NFC #27033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions test/browser/separate_metadata_later.cpp → test/browser/separate_metadata_later.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#include <emscripten.h>

EMSCRIPTEN_KEEPALIVE extern "C" void finish() {
REPORT_RESULT(1);
EMSCRIPTEN_KEEPALIVE void finish() {
emscripten_force_exit(0);
}

int main() {
Expand All @@ -17,7 +17,7 @@ int main() {
Module["removeRunDependency"] = function(id) {
real(id);
if (id === "more.js.metadata") {
Module["_finish"]();
_finish();
}
};
function loadChildScript(name, then) {
Expand All @@ -29,5 +29,6 @@ int main() {
loadChildScript("more.js");
}, 1);
});
emscripten_exit_with_live_runtime();
return 99;
}

3 changes: 1 addition & 2 deletions test/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,10 +1413,9 @@ def test_fs_lz4fs_package(self):
def test_separate_metadata_later(self):
# see issue #6654 - we need to handle separate-metadata both when we run before
# the main program, and when we are run later

create_file('data.dat', ' ')
self.run_process([FILE_PACKAGER, 'more.data', '--preload', 'data.dat', '--separate-metadata', '--js-output=more.js'])
self.btest(Path('browser/separate_metadata_later.cpp'), '1', cflags=['-sFORCE_FILESYSTEM'])
self.btest_exit('separate_metadata_later.c', cflags=['-sFORCE_FILESYSTEM'])

@requires_safari_version(260001, 'TODO: Fails with "Assertion failed: false"') # Fails in Safari 18.5 (20621.2.5.11.8) with Intel x64 CPU only. Passes on Safari 18.5 (20621.2.5.11.8) with ARM M1, Safari 17.6 (17618.3.11.11.7, 17618)/x64 and Safari 26.0.1 (21622.1.22.11.15)/M4
def test_idbstore(self):
Expand Down
Loading