diff --git a/.gitattributes b/.gitattributes index 8be2dc71d8c040f5c3f9a3af85c24b645868c4a1..8c887e1bc31de85424273af3cd1986f810a048e8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ firefox-78.4.0esr.source.tar.xz filter=lfs diff=lfs merge=lfs -text firefox-78.15.0esr.source.tar.xz filter=lfs diff=lfs merge=lfs -text firefox-91.6.0esr.source.tar.xz filter=lfs diff=lfs merge=lfs -text +firefox-91.9.1esr.source.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/copy-headers.patch b/copy-headers.patch index 2c7798167e7136ffa41db55c58e9261de9f84e58..aafe1aa84bd3401d3f3d731f2bba334d55734468 100644 --- a/copy-headers.patch +++ b/copy-headers.patch @@ -2,12 +2,12 @@ From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 15 Jul 2020 08:27:39 +0200 Subject: [PATCH] build: Copy headers on install instead of symlinking - + Patch by Philip Chimento ported forward to mozjs78 --- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) - + diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py index d964466..0285ad9 100644 --- a/python/mozbuild/mozbuild/backend/recursivemake.py @@ -15,7 +15,7 @@ index d964466..0285ad9 100644 @@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend): " of srcdir-relative or absolute paths." ) - + - install_manifest.add_pattern_link(basepath, wild, dest_dir) + install_manifest.add_pattern_copy(basepath, wild, dest_dir) else: @@ -34,4 +34,5 @@ index d964466..0285ad9 100644 install_manifest.add_optional_exists(dest_file) objdir_files.append(self._pretty_path(f, backend_file)) -- -2.31.1 \ No newline at end of file +2.31.1 + diff --git a/emitter.patch b/emitter.patch index ec5547c450a65c9d94ada3a109cee43ca42d3561..556bebd257caa2ccb9cbe848a6a14fdc884756ae 100644 --- a/emitter.patch +++ b/emitter.patch @@ -2,12 +2,12 @@ From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 15 Jul 2020 08:39:47 +0200 Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir - + --- python/mozbuild/mozbuild/frontend/emitter.py | 10 --------- .../mozbuild/test/frontend/test_emitter.py | 22 ------------------- 2 files changed, 32 deletions(-) - + diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index 44b916e..f2e821d 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py @@ -34,9 +34,9 @@ index e53bc5e..c1b9d32 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -1098,28 +1098,6 @@ class TestEmitterBasic(unittest.TestCase): - + self.assertEqual(local_includes, expected) - + - def test_local_includes_invalid(self): - """Test that invalid LOCAL_INCLUDES are properly detected.""" - reader = self.reader("local_includes-invalid/srcdir") @@ -63,4 +63,5 @@ index e53bc5e..c1b9d32 100644 """Test that a filename can't be used in LOCAL_INCLUDES.""" reader = self.reader("local_includes-filename") -- -2.31.1 \ No newline at end of file +2.31.1 + diff --git a/firefox-91.6.0esr.source.tar.xz.asc b/firefox-91.6.0esr.source.tar.xz.asc deleted file mode 100644 index 302be463efe43f8f5e525676aa419c43cbfa4ff3..0000000000000000000000000000000000000000 --- a/firefox-91.6.0esr.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmH4k+gACgkQ6+QekPbx -L23bSQ/9EYSTKO95hdkmGf5upqVYLx1+Pwa1eoUSOgfEBzPJ6GGti1fO+H3lTlMQ -UCFkREUZ3A+JPthMUCC2Rebb0LyFj+5JqV52Tu+xzf7lxfiJqhZ1Jog4IaSHBc4v -rDU10Ir+i55ILquJy09ZbtRh2nyDOo3Vl+DLvQTxHo2ipSaYxZTccXLE46QBp7Om -eFbbvLUhQ9TwG0br9dHNPw6WeJYdjvZXzsh/yO4VO2BLyoakwuPY1P28/CPDBGBX -Lj6tu2oRvx6XYXGIuYTIMGKfNUgzPC25eI88QXOzDB81jHqtifB0hmfKFS18axS/ -Nq3BZMNPnht7GhmnzopsAif2//SGQsZQZsUY2tDYaG+7fLrH49/+vaMNh5/cHQ+7 -fC/PJlEWF/Y3ky6x8gwx4mISPU5QoLaoOFMaCPex6F1Ebnh06x+E293TbIh6LVVz -qi0ZOZkJnnyUYTNeOVP8qGJrFBkbuSsv6JKobheW3HlQlmvg1yf1elF6KhaRoAfR -y85kSh9oAO2k49zHZmq5bO0/4SnYN/0CFcer6UNlzsiOVKAG/T2b1haIgBjTkRSh -jLRZjzCC76WcutZAh3cwjoHRd5R+Q5f8myuUMnQlOw4QnZZnJSA8dF6f5od5d2Cx -J9ox7YI3/VFAu5/Qqg1i/YOitH9bYuAAYRWbR7YyUoJbXGG4KXw= -=UKXR ------END PGP SIGNATURE----- diff --git a/firefox-91.6.0esr.source.tar.xz b/firefox-91.9.1esr.source.tar.xz similarity index 32% rename from firefox-91.6.0esr.source.tar.xz rename to firefox-91.9.1esr.source.tar.xz index 6f352bf7d5dd7174f5a4fe8006dbe2ee742dbfe9..3013bf5b7f8055460db8e0200ccf901cddd85e81 100644 --- a/firefox-91.6.0esr.source.tar.xz +++ b/firefox-91.9.1esr.source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e802832152c39588b9a5c8392e90c1b00036bf948fa4a97a7af0d1435ba09a1 -size 386869628 +oid sha256:090e7f4d79e4373c2a0f286e1e8099ff642ee7611138ceeedcece2e4e5abb560 +size 378762560 diff --git a/firefox-91.9.1esr.source.tar.xz.asc b/firefox-91.9.1esr.source.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..48b80be9627433a07ede085e974f02229af0f27e --- /dev/null +++ b/firefox-91.9.1esr.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmKG57gACgkQ6+QekPbx +L22B5Q//d6P6Lw4HI/QpyruY5pQXY9gl1PJGHGvKrWjyP5Zj1F2URVPKh6UGBdME +GGUSrCm9EyvRnKkQ6quA37Owz6cl7Lub4VPy4D58/pXqf0GKFgE1fpyssN9nppL+ +gVLu8LXCoHCVyDNVF2XHRfY9Q+PdB6ZaxEp3epkjQ5yuXPpoKZHYh36RhUHlIQtW +jzCzDQNPFV5QhiHZsVVZI+E4HkSLv5rnPAjZBn8rmkQYvYOS6WDTR3fr2SQhHkeS +eid/mStkb7NiORwLUabx0xVUda8COiLszkdNkFj+xs7NQ1TUhcT6ZaZQ0zccNqV5 +ie4YvqRxsFeo/7XJ9ms49xNMfygm2IiclyNB61ECVcCP6zPn5zSuoGMkEgJqPI+l +dWGpBQi/hWb/00xy+GNgObpyvGygbEok02sRhN6ZO36DADgth91miqOZN+jCLJyN +uxDjP/fKMt7sXvEA+JxGc2Wj+V578HHmnaSniXc2Xlsy1zfDQ7ijnC3rtoMzMW98 +AjglOYBqeDkYfDBhtgnh0AAsxMv9CwRxXm7O6LKYblbXLwixDS6VLEBAZk4OHlp+ +F5mMsDwpaGbTtNikzEn+kqO/Y24mAGTUpObY2mXpoIhvwfryPOAwhYCTRnQZYr06 +Ytr1DlnP1kfhHTKDHuD4Z7n08/wtm6eH+7GfGVNnE0bw+r95afQ= +=BXKC +-----END PGP SIGNATURE----- diff --git a/fix-soname.patch b/fix-soname.patch index 30894e44ddcf52522ce56330f7c4ec5c6fd6c5af..a319d9e975ef9463c8b5b827b60b6261a6cc3a2c 100644 --- a/fix-soname.patch +++ b/fix-soname.patch @@ -9,18 +9,18 @@ Fix backported from Debian: http://bugs.debian.org/746705 1 file changed, 2 insertions(+) diff --git a/config/rules.mk b/config/rules.mk -index 3965c88..3f92f83 100644 +index 0f9b2ac..f6b4efe 100644 --- a/config/rules.mk +++ b/config/rules.mk -@@ -320,6 +320,8 @@ ifeq ($(OS_ARCH),GNU) +@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU) OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 endif - + +EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 + # # MINGW32 # --- -2.26.2 +-- +2.31.1 diff --git a/icu_sources_data-Write-command-output-to-our-stderr.patch b/icu_sources_data-Write-command-output-to-our-stderr.patch index 02fd7ccc9f7688b68dd7f24e7b024fe894f87f3a..84684250ce4c7ab3b024387e64eec91ad1a596b2 100644 --- a/icu_sources_data-Write-command-output-to-our-stderr.patch +++ b/icu_sources_data-Write-command-output-to-our-stderr.patch @@ -1,21 +1,20 @@ - From: Simon McVittie Date: Mon, 9 Oct 2017 09:23:14 +0100 Subject: icu_sources_data: Write command output to our stderr - + Saying "See output in /tmp/foobar" is all very well for a developer build, but on a buildd our /tmp is going to get thrown away after the build. Just log the usual way instead. --- intl/icu_sources_data.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) - + diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py index 4db52af..d62960d 100644 --- a/intl/icu_sources_data.py +++ b/intl/icu_sources_data.py @@ -188,21 +188,13 @@ def update_sources(topsrcdir): - + def try_run(name, command, cwd=None, **kwargs): try: - with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f: @@ -38,7 +37,8 @@ index 4db52af..d62960d 100644 else: - os.unlink(f.name) return True - - + + -- -2.31.1 \ No newline at end of file +2.31.1 + diff --git a/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch index f82cb99a05bb51898334cc89c2ca689593cdc96a..8572c21fd4ec2ec38263912256040a290f33b125 100644 --- a/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch +++ b/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch @@ -1,14 +1,14 @@ From: Simon McVittie Date: Mon, 9 Oct 2017 09:22:12 +0100 Subject: icu_sources_data.py: Decouple from Mozilla build system - + mozpack.path is a wrapper around os.path that normalizes path separators on Windows, but on Unix we only have one path separator so there's nothing to normalize. Avoid needing to import all of it. --- intl/icu_sources_data.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) - + diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py index 2936df9..4db52af 100644 --- a/intl/icu_sources_data.py @@ -16,13 +16,14 @@ index 2936df9..4db52af 100644 @@ -21,7 +21,9 @@ import subprocess import sys import tempfile - + -from mozpack import path as mozpath +# Close enough +import os.path as mozpath +mozpath.normsep = lambda p: p - + # The following files have been determined to be dead/unused by a # semi-automated analysis. You can just remove any of the files below -- -2.31.1 \ No newline at end of file +2.31.1 + diff --git a/init_patch.patch b/init_patch.patch index 301d78a24db06cc7ec189027e862b93978c3af3b..1954a55bf3691447b52ea9cad44d6ae3274c3b5b 100644 --- a/init_patch.patch +++ b/init_patch.patch @@ -2,11 +2,11 @@ From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 9 Aug 2021 14:38:58 +0200 Subject: [PATCH] Don't throw InvalidOptionError on invalid options - + --- python/mozbuild/mozbuild/configure/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) - + diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py index f3167f6..c9e1132 100644 --- a/python/mozbuild/mozbuild/configure/__init__.py @@ -20,9 +20,9 @@ index f3167f6..c9e1132 100644 - else: - raise InvalidOptionError(msg) + self._logger.warning(msg) - + # Run the execution queue for func, args in self._execution_queue: -- 2.31.1 - \ No newline at end of file + diff --git a/known_failures.txt b/known_failures.txt index 1ff47f656cda5a980791bec294e006a6e25ca73d..027ceffc3d3b4419f76cc762e70bfae3b4c0ef76 100644 --- a/known_failures.txt +++ b/known_failures.txt @@ -1,12 +1,12 @@ -non262/Intl/available-locales-resolved.js -non262/Intl/available-locales-supported.js -non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js -non262/Intl/DateTimeFormat/tz-environment-variable.js -non262/Intl/DateTimeFormat/day-period-hour-cycle.js -non262/Intl/DateTimeFormat/timeZone_version.js -non262/Date/toString-localized.js -non262/Date/reset-time-zone-cache-same-offset.js -non262/Date/time-zones-imported.js -non262/Date/time-zones-historic.js -non262/Date/toString-localized-posix.js -non262/Date/time-zone-path.js \ No newline at end of file +non262/Intl/available-locales-resolved.js +non262/Intl/available-locales-supported.js +non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js +non262/Intl/DateTimeFormat/tz-environment-variable.js +non262/Intl/DateTimeFormat/day-period-hour-cycle.js +non262/Intl/DateTimeFormat/timeZone_version.js +non262/Date/toString-localized.js +non262/Date/reset-time-zone-cache-same-offset.js +non262/Date/time-zones-imported.js +non262/Date/time-zones-historic.js +non262/Date/toString-localized-posix.js +non262/Date/time-zone-path.js diff --git a/mozilla.keyring b/mozilla.keyring index 50eade5579e95d918d215c0589f55c12901b8ae6..a3e183ae5399617c618794a31e604166e8bc86dc 100644 --- a/mozilla.keyring +++ b/mozilla.keyring @@ -366,4 +366,4 @@ AUbFmwhEcgd9xMY5w6+8/5FjoXwHYmdfjKT9iD7QxF3LnymskoKQQGWBHiwJjaA8 LYPpopUg9we00zNdSGNXv1Lau9AM//ATiusH8iLJj33ofQh6FviQG6W3TlLPqx/o IxxNj5bPAQy6dRKB1TxlWr4X0pUWxuqBeObPoHS9j0ysxKPruw== =81zK ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file +-----END PGP PUBLIC KEY BLOCK----- diff --git a/mozjs91.spec b/mozjs91.spec index 0ca8f749122efe8d8e9c5fa2307c611ff99ad5d8..f3526e54c9444572cb6fd458606c2bb2c6b404fc 100644 --- a/mozjs91.spec +++ b/mozjs91.spec @@ -8,14 +8,13 @@ %global build_with_lto 1 # Require tests to pass? %global require_tests 0 -# LTO is default since F33 and F32 package is backported as is, so no LTO there +# LTO is default # Big endian platforms Name: mozjs%{major} -Version: 91.6.0 -Release: 2 +Version: 91.9.1 +Release: 1 Summary: SpiderMonkey JavaScript library -License: MPL-2.0 -Group: System/Libraries +License: MPLv2.0 URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz Source1: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz.asc @@ -31,13 +30,17 @@ Patch09: icu_sources_data.py-Decouple-from-Mozilla-build-system.patch Patch10: icu_sources_data-Write-command-output-to-our-stderr.patch # Build fixes - https://hg.mozilla.org/mozilla-central/rev/ca36a6c4f8a4a0ddaa033fdbe20836d87bbfb873 Patch12: emitter.patch +Patch13: tests-Use-native-TemporaryDirectory.patch # Build fixes Patch14: init_patch.patch +Patch15: remove-sloppy-m4-detection-from-bundled-autoconf.patch + # TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed -Patch15: spidermonkey_checks_disable.patch +Patch16: spidermonkey_checks_disable.patch BuildRequires: autoconf213 cargo clang-devel gcc gcc-c++ libtool perl-devel llvm llvm-devel nasm pkgconfig python3-devel python3-setuptools -BuildRequires: python3-six readline-devel zip rust pkgconfig(icu-i18n) >= 67.1 pkgconfig(libffi) pkgconfig(nspr) pkgconfig(zlib) icu +BuildRequires: python3-six readline-devel zip rust pkgconfig(libffi) pkgconfig(nspr) pkgconfig(zlib) +BuildRequires: m4 make libicu-devel perl-devel %description SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of @@ -46,7 +49,6 @@ that provide host environments for JavaScript. %package -n libmozjs-%{major}-0 Summary: JavaScript's library -Group: System/Libraries %description -n libmozjs-%{major}-0 JavaScript is the Netscape-developed object scripting language used in millions @@ -58,7 +60,6 @@ This package contains the JavaScript's library. %package devel Summary: Development files and tools for %{name} -Group: Development/Libraries/Other Requires: libmozjs-%{major}-0 = %{version} Requires: pkgconfig @@ -171,20 +172,21 @@ mv %{buildroot}%{_libdir}/libmozjs-%{major}.so \ ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0 ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so popd + %check pushd js/src # Run SpiderMonkey tests %if 0%{?require_tests} -PYTHONPATH=tests/lib python3 tests/jstests.py -d -s -t 1800 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} +PYTHONPATH=tests/lib python3 tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} %else -PYTHONPATH=tests/lib python3 tests/jstests.py -d -s -t 1800 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || : +PYTHONPATH=tests/lib python3 tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || : %endif # Run basic JIT tests %if 0%{?require_tests} -PYTHONPATH=tests/lib python3 jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/dist/bin/js%{major} basic +PYTHONPATH=tests/lib python3 jit-test/jit_test.py -s -t 2400 --no-progress ../../js/src/dist/bin/js%{major} basic %else -PYTHONPATH=tests/lib python3 jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/dist/bin/js%{major} basic || : +PYTHONPATH=tests/lib python3 jit-test/jit_test.py -s -t 2400 --no-progress ../../js/src/dist/bin/js%{major} basic || : %endif popd @@ -206,6 +208,9 @@ popd %{_includedir}/mozjs-%{major}/ %changelog +* Mon Jun 13 2022 lin zhang - 91.9.1-1 +- update to 91.9.1 + * Fri May 06 2022 wangkerong - 91.6.0-2 - remove %dist diff --git a/remove-sloppy-m4-detection-from-bundled-autoconf.patch b/remove-sloppy-m4-detection-from-bundled-autoconf.patch new file mode 100644 index 0000000000000000000000000000000000000000..10b8b16ea7dc9ba9425c80909b8e467965dda77f --- /dev/null +++ b/remove-sloppy-m4-detection-from-bundled-autoconf.patch @@ -0,0 +1,29 @@ +From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Mon, 9 Aug 2021 16:15:37 +0200 +Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf + +--- + build/autoconf/autoconf.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh +index ceb8a25..606c74e 100644 +--- a/build/autoconf/autoconf.sh ++++ b/build/autoconf/autoconf.sh +@@ -114,12 +114,6 @@ fi + + # Use the frozen version of Autoconf if available. + r= f= +-# Some non-GNU m4's don't reject the --help option, so give them /dev/null. +-case `$M4 --help < /dev/null 2>&1` in +-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; +-*traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; +-esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || + { rm -f $tmpin $tmpout; exit 2; } +-- +2.31.1 + diff --git a/spidermonkey_checks_disable.patch b/spidermonkey_checks_disable.patch index cad6a4922bf32f662a4a9e743728d5d4dd0ac706..451d3eef47f649aed9f24bc5d83274868a239bc7 100644 --- a/spidermonkey_checks_disable.patch +++ b/spidermonkey_checks_disable.patch @@ -1,13 +1,12 @@ - From 6ebe8ce6a3267c96454de3cd453269b4c4053a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 9 Aug 2021 14:41:14 +0200 Subject: [PATCH] Don't die on SpiderMonkey checks - + --- config/run_spidermonkey_checks.py | 2 -- 1 file changed, 2 deletions(-) - + diff --git a/config/run_spidermonkey_checks.py b/config/run_spidermonkey_checks.py index 0f842d9..b49db52 100644 --- a/config/run_spidermonkey_checks.py @@ -19,4 +18,5 @@ index 0f842d9..b49db52 100644 - if retcode != 0: - raise Exception(script + " failed") -- -2.31.1 \ No newline at end of file +2.31.1 + diff --git a/tests-Use-native-TemporaryDirectory.patch b/tests-Use-native-TemporaryDirectory.patch new file mode 100644 index 0000000000000000000000000000000000000000..054685c1eee2b695d7ec6a1b095f383a6070f33c --- /dev/null +++ b/tests-Use-native-TemporaryDirectory.patch @@ -0,0 +1,66 @@ +From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Tue, 10 Aug 2021 00:00:50 +0200 +Subject: [PATCH] Tests: Use native TemporaryDirectory + +Without ugly wrapper for Py < 3.2 that doesn't work half of the times... +--- + js/src/jit-test/jit_test.py | 2 +- + js/src/tests/jstests.py | 2 +- + js/src/tests/lib/tempfile.py | 17 +---------------- + 3 files changed, 3 insertions(+), 18 deletions(-) + +diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py +index f5d7794..8d443aa 100755 +--- a/js/src/jit-test/jit_test.py ++++ b/js/src/jit-test/jit_test.py +@@ -38,7 +38,7 @@ from lib.tests import ( + get_environment_overlay, + change_env, + ) +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + + + def which(name): +diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py +index 6fa2f5f..53ceff6 100755 +--- a/js/src/tests/jstests.py ++++ b/js/src/tests/jstests.py +@@ -37,7 +37,7 @@ from lib.tests import ( + from lib.results import ResultsSink, TestOutput + from lib.progressbar import ProgressBar + from lib.adaptor import xdr_annotate +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + + if sys.platform.startswith("linux") or sys.platform.startswith("darwin"): + from lib.tasks_unix import run_all_tests +diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py +index ecc21c9..f0a1fa3 100644 +--- a/js/src/tests/lib/tempfile.py ++++ b/js/src/tests/lib/tempfile.py +@@ -2,19 +2,4 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + from __future__ import absolute_import +- +-try: +- # Python 3.2 +- from tempfile import TemporaryDirectory +-except ImportError: +- import tempfile +- import shutil +- from contextlib import contextmanager +- +- @contextmanager +- def TemporaryDirectory(*args, **kwds): +- d = tempfile.mkdtemp(*args, **kwds) +- try: +- yield d +- finally: +- shutil.rmtree(d) ++from tempfile import TemporaryDirectory +-- +2.31.1 + diff --git a/tests-increase-timeout.patch b/tests-increase-timeout.patch index b2bba7bd10f1e52b19777d578ef754b4cce3d2be..c86cca403deb09c87041a27b39ebdd3da1997c98 100644 --- a/tests-increase-timeout.patch +++ b/tests-increase-timeout.patch @@ -1,25 +1,26 @@ -From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= -Date: Wed, 15 Jul 2020 08:32:44 +0200 -Subject: [PATCH] Increase the test timeout for slower buildds - -Ported forward from Debian: https://bugs.debian.org/878284 ---- - js/src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/Makefile.in b/js/src/Makefile.in -index b86aeed..d68655a 100644 ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -53,7 +53,7 @@ check:: check-js-msg - - check-jstests: - $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ -- --no-progress --format=automation --timeout 300 \ -+ --no-progress --format=automation --timeout 600 \ - $(JSTESTS_EXTRA_ARGS) \ - $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX) - --- -2.26.2 \ No newline at end of file +From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 15 Jul 2020 08:32:44 +0200 +Subject: [PATCH] Increase the test timeout for slower buildds + +Ported forward from Debian: https://bugs.debian.org/878284 +--- + js/src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index b86aeed..d68655a 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -53,7 +53,7 @@ check:: check-js-msg + + check-jstests: + $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ +- --no-progress --format=automation --timeout 300 \ ++ --no-progress --format=automation --timeout 600 \ + $(JSTESTS_EXTRA_ARGS) \ + $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX) + +-- +2.26.2 +