summaryrefslogtreecommitdiffstats
path: root/tools/rusttests
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
commitfbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /tools/rusttests
parentReleasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
downloadfirefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz
firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/rusttests')
-rw-r--r--tools/rusttests/config/mozconfigs/win32/rusttests2
-rw-r--r--tools/rusttests/config/mozconfigs/win64/rusttests2
-rw-r--r--tools/rusttests/moz.configure2
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/rusttests/config/mozconfigs/win32/rusttests b/tools/rusttests/config/mozconfigs/win32/rusttests
index d953f9c0df..ae98836576 100644
--- a/tools/rusttests/config/mozconfigs/win32/rusttests
+++ b/tools/rusttests/config/mozconfigs/win32/rusttests
@@ -1,3 +1,3 @@
ac_add_options --target=i686-pc-windows-msvc
-. "$topsrcdir/build/win32/mozconfig.vs-latest"
+. "$topsrcdir/build/mozconfig.clang-cl"
. "$topsrcdir/tools/rusttests/config/mozconfigs/windows-common"
diff --git a/tools/rusttests/config/mozconfigs/win64/rusttests b/tools/rusttests/config/mozconfigs/win64/rusttests
index ed81e3b767..a166390d79 100644
--- a/tools/rusttests/config/mozconfigs/win64/rusttests
+++ b/tools/rusttests/config/mozconfigs/win64/rusttests
@@ -1,3 +1,3 @@
ac_add_options --target=x86_64-pc-windows-msvc
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
+. "$topsrcdir/build/mozconfig.clang-cl"
. "$topsrcdir/tools/rusttests/config/mozconfigs/windows-common"
diff --git a/tools/rusttests/moz.configure b/tools/rusttests/moz.configure
index 520989a8cf..959aa4eafe 100644
--- a/tools/rusttests/moz.configure
+++ b/tools/rusttests/moz.configure
@@ -2,4 +2,6 @@
# 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/.
+imply_option("MOZ_PLACES", True)
+
include("../../toolkit/moz.configure")