nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

errors: fix translation's run-make test

Browse Source 
`run-make/translation` had some targets that weren't listed in `all` and
thus weren't being tested - the behaviour that should have been being
tested was basically correct fortunately.

Signed-off-by: David Wood <david.wood@huawei.com>
This commit is contained in:
David Wood 2022-10-17 11:36:54 +01:00
parent d1fcf61117
commit a8e37507f4
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_errors/src/translation.rs
View File

@ -4,6 +4,7 @@ use crate::{DiagnosticArg, DiagnosticMessage, FluentBundle};
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
use rustc_error_messages::FluentArgs; use rustc_error_messages::FluentArgs;
use std::borrow::Cow; use std::borrow::Cow;
use std::env;
use std::error::Report; use std::error::Report;
/// Convert diagnostic arguments (a rustc internal type that exists to implement /// Convert diagnostic arguments (a rustc internal type that exists to implement
@ -94,8 +95,16 @@ pub trait Translate {
// The primary bundle was present and translation succeeded // The primary bundle was present and translation succeeded
Some(Ok(t)) => t, Some(Ok(t)) => t,
// Always yeet out for errors on debug // Always yeet out for errors on debug (unless
Some(Err(primary)) if cfg!(debug_assertions) => do yeet primary, // `RUSTC_TRANSLATION_NO_DEBUG_ASSERT` is set in the environment - this allows
// local runs of the test suites, of builds with debug assertions, to test the
// behaviour in a normal build).
Some(Err(primary))
if cfg!(debug_assertions)
&& env::var("RUSTC_TRANSLATION_NO_DEBUG_ASSERT").is_err() =>
{
do yeet primary
}
// If `translate_with_bundle` returns `Err` with the primary bundle, this is likely // If `translate_with_bundle` returns `Err` with the primary bundle, this is likely
// just that the primary bundle doesn't contain the message being translated or // just that the primary bundle doesn't contain the message being translated or

18
tests/run-make/translation/Makefile
View File

@ -6,8 +6,10 @@ include ../../run-make-fulldeps/tools.mk
SYSROOT:=$(shell $(RUSTC) --print sysroot) SYSROOT:=$(shell $(RUSTC) --print sysroot)
FAKEROOT=$(TMPDIR)/fakeroot FAKEROOT=$(TMPDIR)/fakeroot
RUSTC_LOG:=rustc_error_messages
export RUSTC_TRANSLATION_NO_DEBUG_ASSERT:=1
all: normal custom sysroot all: normal custom missing broken sysroot sysroot-invalid sysroot-missing
# Check that the test works normally, using the built-in fallback bundle. # Check that the test works normally, using the built-in fallback bundle.
normal: test.rs normal: test.rs
@ -32,6 +34,7 @@ broken: test.rs broken.ftl
# identifier by making a local copy of the sysroot and adding the custom locale # identifier by making a local copy of the sysroot and adding the custom locale
# to it. # to it.
sysroot: test.rs working.ftl sysroot: test.rs working.ftl
rm -rf $(FAKEROOT)
mkdir $(FAKEROOT) mkdir $(FAKEROOT)
ln -s $(SYSROOT)/* $(FAKEROOT) ln -s $(SYSROOT)/* $(FAKEROOT)
rm -f $(FAKEROOT)/lib rm -f $(FAKEROOT)/lib
@ -51,12 +54,12 @@ sysroot: test.rs working.ftl
# found. This test might start failing if there actually exists a Klingon # found. This test might start failing if there actually exists a Klingon
# translation of rustc's error messages. # translation of rustc's error messages.
sysroot-missing: sysroot-missing:
$(RUSTC) $< -Ztranslate-lang=tlh 2>&1 || grep "missing locale directory" $(RUSTC) $< -Ztranslate-lang=tlh 2>&1 | grep "missing locale directory"
# Check that the compiler errors out when the sysroot requested cannot be # Check that the compiler errors out when the directory for the locale in the
# found. This test might start failing if there actually exists a Klingon # sysroot is actually a file.
# translation of rustc's error messages.
sysroot-invalid: test.rs working.ftl sysroot-invalid: test.rs working.ftl
rm -rf $(FAKEROOT)
mkdir $(FAKEROOT) mkdir $(FAKEROOT)
ln -s $(SYSROOT)/* $(FAKEROOT) ln -s $(SYSROOT)/* $(FAKEROOT)
rm -f $(FAKEROOT)/lib rm -f $(FAKEROOT)/lib
@ -68,5 +71,6 @@ sysroot-invalid: test.rs working.ftl
rm -f $(FAKEROOT)/lib/rustlib/src rm -f $(FAKEROOT)/lib/rustlib/src
mkdir $(FAKEROOT)/lib/rustlib/src mkdir $(FAKEROOT)/lib/rustlib/src
ln -s $(SYSROOT)/lib/rustlib/src/* $(FAKEROOT)/lib/rustlib/src ln -s $(SYSROOT)/lib/rustlib/src/* $(FAKEROOT)/lib/rustlib/src
touch $(FAKEROOT)/share/locale/zh-CN/ mkdir -p $(FAKEROOT)/share/locale
$(RUSTC) $< --sysroot $(FAKEROOT) -Ztranslate-lang=zh-CN 2>&1 || grep "`\$sysroot/share/locales/\$locale` is not a directory" touch $(FAKEROOT)/share/locale/zh-CN
$(RUSTC) $< --sysroot $(FAKEROOT) -Ztranslate-lang=zh-CN 2>&1 | grep "`\$sysroot/share/locales/\$locale` is not a directory"