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
-
a21c94fd
by Beatriz Rizental at 2025-03-06T10:30:48+01:00
-
d5d98c87
by Beatriz Rizental at 2025-03-06T10:30:48+01:00
-
e68b047e
by Beatriz Rizental at 2025-03-06T10:30:49+01:00
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:
| ... | ... | @@ -18,3 +18,5 @@ ac_add_options --disable-install-strip |
| 18 | 18 | |
| 19 | 19 | ac_add_options --with-base-browser-version=dev-build
|
| 20 | 20 | ac_add_options --disable-base-browser-update
|
| 21 | + |
|
| 22 | +ac_add_options --enable-tests |
| ... | ... | @@ -21,3 +21,5 @@ ac_add_options --disable-base-browser-update |
| 21 | 21 | |
| 22 | 22 | # Let's make sure no preference is enabling either Adobe's or Google's CDM.
|
| 23 | 23 | ac_add_options --disable-eme
|
| 24 | + |
|
| 25 | +ac_add_options --enable-tests |
| ... | ... | @@ -25,3 +25,5 @@ ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser |
| 25 | 25 | #copied from the diff between mozconfig-linux-x86_64 and mozconfig-linux-x86_64-dev
|
| 26 | 26 | export MOZ_APP_REMOTINGNAME="Tor Browser Dev"
|
| 27 | 27 | ac_add_options --with-branding=browser/branding/tb-nightly
|
| 28 | + |
|
| 29 | +ac_add_options --enable-tests |
| ... | ... | @@ -222,7 +222,7 @@ class MarionetteTestResult(StructuredTestResult, TestResultCollection): |
| 222 | 222 | self.logger.info("END LOG:")
|
| 223 | 223 | |
| 224 | 224 | def stopTest(self, *args, **kwargs):
|
| 225 | - unittest._TextTestResult.stopTest(self, *args, **kwargs)
|
|
| 225 | + unittest.TextTestResult.stopTest(self, *args, **kwargs)
|
|
| 226 | 226 | if self.marionette.check_for_crash():
|
| 227 | 227 | # this tells unittest.TestSuite not to continue running tests
|
| 228 | 228 | self.shouldStop = True
|
| ... | ... | @@ -40,6 +40,18 @@ this.specialpowers = class extends ExtensionAPI { |
| 40 | 40 | uri,
|
| 41 | 41 | resProto.ALLOW_CONTENT_ACCESS
|
| 42 | 42 | );
|
| 43 | + } else {
|
|
| 44 | + // This is a hack!
|
|
| 45 | + // For some reason, this specific substituion has an extra `/` in the path.
|
|
| 46 | + // This is a workaround to fix it.
|
|
| 47 | + //
|
|
| 48 | + // TODO (#43545): Remove this once we have a proper fix.
|
|
| 49 | + let uri = resProto.getSubstitution("testing-common");
|
|
| 50 | + resProto.setSubstitution(
|
|
| 51 | + "testing-common",
|
|
| 52 | + Services.io.newURI(uri.spec.replace("file:////", "file:///")),
|
|
| 53 | + resProto.ALLOW_CONTENT_ACCESS
|
|
| 54 | + );
|
|
| 43 | 55 | }
|
| 44 | 56 | |
| 45 | 57 | SpecialPowersParent.registerActor();
|
| ... | ... | @@ -53,6 +53,9 @@ build: |
| 53 | 53 | deploy:
|
| 54 | 54 | ./deploy.sh $(BINARIES) $(BUILD_OUTPUT)
|
| 55 | 55 | |
| 56 | +prepare-tests:
|
|
| 57 | + ./prepare-tests.sh $(BINARIES) $(BUILD_OUTPUT)
|
|
| 58 | + |
|
| 56 | 59 | all: build deploy
|
| 57 | 60 | |
| 58 | 61 | run:
|
| 1 | +#!/bin/sh
|
|
| 2 | +set -e
|
|
| 3 | + |
|
| 4 | +BINARIES="$1"
|
|
| 5 | +BUILD_OUTPUT="$2"
|
|
| 6 | + |
|
| 7 | +if [ ! -d "$BUILD_OUTPUT" ]; then
|
|
| 8 | + echo "Error: $BUILD_OUTPUT directory does not exist."
|
|
| 9 | + echo "Make sure to run `mach ./build` or `make -C tools/torbrowser build`."
|
|
| 10 | + exit 1
|
|
| 11 | +fi
|
|
| 12 | + |
|
| 13 | +if [ ! -d "$BINARIES" ]; then
|
|
| 14 | + echo "Error: $BINARIES directory does not exist."
|
|
| 15 | + echo "Make sure to run `make -C tools/torbrowser fetch`."
|
|
| 16 | + exit 1
|
|
| 17 | +fi
|
|
| 18 | + |
|
| 19 | +if [ "$(uname)" = "Darwin" ]; then
|
|
| 20 | + cp -r "$BINARIES/Tor Browser.app/Contents/MacOS/Tor" "$BUILD_OUTPUT/dist/firefox/"*.app/Contents/MacOS
|
|
| 21 | + cp -r "$BINARIES/Tor Browser.app/Contents/Resources/fonts" "$BUILD_OUTPUT/dist/firefox/"*.app/Contents/Resources
|
|
| 22 | +else
|
|
| 23 | + cp -r "$BINARIES/dev/Browser/fonts" "$BUILD_OUTPUT/dist/bin"
|
|
| 24 | + cp -r "$BINARIES/dev/Browser/TorBrowser" "$BUILD_OUTPUT/dist/bin"
|
|
| 25 | +fi |