Merge branch 'release' into 'master'
Reproducible build See merge request Librem5/squeekboard!413
This commit is contained in:
		
							
								
								
									
										20
									
								
								src/data.rs
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								src/data.rs
									
									
									
									
									
								
							@ -746,13 +746,21 @@ mod tests {
 | 
			
		||||
 | 
			
		||||
    use ::logging::ProblemPanic;
 | 
			
		||||
 | 
			
		||||
    const THIS_FILE: &str = file!();
 | 
			
		||||
 | 
			
		||||
    fn path_from_root(file: &'static str) -> PathBuf {
 | 
			
		||||
        PathBuf::from(THIS_FILE)
 | 
			
		||||
            .parent().unwrap()
 | 
			
		||||
            .parent().unwrap()
 | 
			
		||||
            .join(file)
 | 
			
		||||
        let source_dir = env::var("SOURCE_DIR")
 | 
			
		||||
            .map(PathBuf::from)
 | 
			
		||||
            .unwrap_or_else(|e| {
 | 
			
		||||
                if let env::VarError::NotPresent = e {
 | 
			
		||||
                    let this_file = file!();
 | 
			
		||||
                    PathBuf::from(this_file)
 | 
			
		||||
                        .parent().unwrap()
 | 
			
		||||
                        .parent().unwrap()
 | 
			
		||||
                        .into()
 | 
			
		||||
                } else {
 | 
			
		||||
                    panic!("{:?}", e);
 | 
			
		||||
                }
 | 
			
		||||
            });
 | 
			
		||||
        source_dir.join(file)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    #[test]
 | 
			
		||||
 | 
			
		||||
@ -80,6 +80,7 @@ test(
 | 
			
		||||
    'rstest',
 | 
			
		||||
    cargo_script,
 | 
			
		||||
    args: ['test'] + cargo_build_flags,
 | 
			
		||||
    env: ['SOURCE_DIR=' + meson.source_root()],
 | 
			
		||||
    # this is a whole Carg-based test suite, let it run for a while
 | 
			
		||||
    timeout: 900,
 | 
			
		||||
    depends: [build_rstests, cargo_toml],
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user