From 9a0ac8dccea49c9e521a22a3a1300b98c52f2984 Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Thu, 25 Aug 2022 13:18:06 +0300 Subject: [PATCH] Make `test_all_localizations` run at unittest --- .gitlab/scripts/unittest.sh | 10 +++++++--- voxygen/i18n/src/analysis.rs | 1 + voxygen/i18n/src/lib.rs | 5 ----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/scripts/unittest.sh b/.gitlab/scripts/unittest.sh index 06cd7a1b2e..a48387af9f 100755 --- a/.gitlab/scripts/unittest.sh +++ b/.gitlab/scripts/unittest.sh @@ -1,4 +1,8 @@ #!/bin/bash -export VELOREN_ASSETS="$(pwd)/assets" -time cargo test --package veloren-common-assets asset_tweak::tests --features asset_tweak --lib && -time cargo test +VELOREN_ASSETS="$(pwd)/assets" +export VELOREN_ASSETS + +time cargo test \ + --package veloren-common-assets asset_tweak::tests \ + --features asset_tweak --lib && +time cargo test --features stat diff --git a/voxygen/i18n/src/analysis.rs b/voxygen/i18n/src/analysis.rs index 396bc1b292..48a4351091 100644 --- a/voxygen/i18n/src/analysis.rs +++ b/voxygen/i18n/src/analysis.rs @@ -30,6 +30,7 @@ fn keys_from_file(filepath: &Path) -> Vec { ResourceErr::parsing_error(errs, file.clone(), &content) ) }); + let mut keys = Vec::new(); for entry in ast.body { match entry { diff --git a/voxygen/i18n/src/lib.rs b/voxygen/i18n/src/lib.rs index ad40e9b8fa..fb23a63198 100644 --- a/voxygen/i18n/src/lib.rs +++ b/voxygen/i18n/src/lib.rs @@ -163,10 +163,6 @@ impl assets::Compound for Language { // Here go dragons for id in cache.load_dir::(path, true)?.ids() { - if id.ends_with("_manifest") { - continue; - } - match cache.load(id) { Ok(handle) => { let source: &raw::Resource = &*handle.read(); @@ -518,7 +514,6 @@ mod tests { } #[test] - #[ignore] #[cfg(feature = "stat")] // Generate translation stats fn test_all_localizations() {