Pier Angelo Vendrame pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 3d30c6e9 by Julian Descottes at 2025-03-06T10:30:48+01:00 Bug 1917556 - [marionette] Fix Mn tests with Python 3.12 r=webdriver-reviewers,whimboo Differential Revision: https://phabricator.services.mozilla.com/D221448 - - - - - a21c94fd by Beatriz Rizental at 2025-03-06T10:30:48+01:00 fixup! Base Browser's .mozconfigs. - - - - - d5d98c87 by Beatriz Rizental at 2025-03-06T10:30:48+01:00 fixup! TB 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - e68b047e by Beatriz Rizental at 2025-03-06T10:30:49+01:00 BB 43535: Enable tests - - - - - 7 changed files: - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64-dev - mozconfig-macos-dev - testing/marionette/harness/marionette_harness/runner/base.py - testing/specialpowers/api.js - tools/torbrowser/Makefile - + tools/torbrowser/prepare-tests.sh Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -18,3 +18,5 @@ ac_add_options --disable-install-strip ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +ac_add_options --enable-tests ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -21,3 +21,5 @@ ac_add_options --disable-base-browser-update # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme + +ac_add_options --enable-tests ===================================== mozconfig-macos-dev ===================================== @@ -25,3 +25,5 @@ ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser #copied from the diff between mozconfig-linux-x86_64 and mozconfig-linux-x86_64-dev export MOZ_APP_REMOTINGNAME="Tor Browser Dev" ac_add_options --with-branding=browser/branding/tb-nightly + +ac_add_options --enable-tests ===================================== testing/marionette/harness/marionette_harness/runner/base.py ===================================== @@ -222,7 +222,7 @@ class MarionetteTestResult(StructuredTestResult, TestResultCollection): self.logger.info("END LOG:") def stopTest(self, *args, **kwargs): - unittest._TextTestResult.stopTest(self, *args, **kwargs) + unittest.TextTestResult.stopTest(self, *args, **kwargs) if self.marionette.check_for_crash(): # this tells unittest.TestSuite not to continue running tests self.shouldStop = True ===================================== testing/specialpowers/api.js ===================================== @@ -40,6 +40,18 @@ this.specialpowers = class extends ExtensionAPI { uri, resProto.ALLOW_CONTENT_ACCESS ); + } else { + // This is a hack! + // For some reason, this specific substituion has an extra `/` in the path. + // This is a workaround to fix it. + // + // TODO (#43545): Remove this once we have a proper fix. + let uri = resProto.getSubstitution("testing-common"); + resProto.setSubstitution( + "testing-common", + Services.io.newURI(uri.spec.replace("file:////", "file:///")), + resProto.ALLOW_CONTENT_ACCESS + ); } SpecialPowersParent.registerActor(); ===================================== tools/torbrowser/Makefile ===================================== @@ -53,6 +53,9 @@ build: deploy: ./deploy.sh $(BINARIES) $(BUILD_OUTPUT) +prepare-tests: + ./prepare-tests.sh $(BINARIES) $(BUILD_OUTPUT) + all: build deploy run: ===================================== tools/torbrowser/prepare-tests.sh ===================================== @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +BINARIES="$1" +BUILD_OUTPUT="$2" + +if [ ! -d "$BUILD_OUTPUT" ]; then + echo "Error: $BUILD_OUTPUT directory does not exist." + echo "Make sure to run `mach ./build` or `make -C tools/torbrowser build`." + exit 1 +fi + +if [ ! -d "$BINARIES" ]; then + echo "Error: $BINARIES directory does not exist." + echo "Make sure to run `make -C tools/torbrowser fetch`." + exit 1 +fi + +if [ "$(uname)" = "Darwin" ]; then + cp -r "$BINARIES/Tor Browser.app/Contents/MacOS/Tor" "$BUILD_OUTPUT/dist/firefox/"*.app/Contents/MacOS + cp -r "$BINARIES/Tor Browser.app/Contents/Resources/fonts" "$BUILD_OUTPUT/dist/firefox/"*.app/Contents/Resources +else + cp -r "$BINARIES/dev/Browser/fonts" "$BUILD_OUTPUT/dist/bin" + cp -r "$BINARIES/dev/Browser/TorBrowser" "$BUILD_OUTPUT/dist/bin" +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/347af8e... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/347af8e... You're receiving this email because of your account on gitlab.torproject.org.