epita/epitls-pi
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

now ignores previous definitions of main in tests

Browse source
This commit is contained in:
JOLIMAITRE Matthieu 2023-01-11 16:47:17 +01:00
parent 96e984244b
commit 77f0a9b9a3
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test.rs
View file

@ -1,12 +1,14 @@
use std::{fs, path::PathBuf, thread, time::Duration}; use std::{fs, path::PathBuf, thread, time::Duration};
use crate::{ use crate::{
config::Config,
tasks::{CompileTask, GenTask, RunTask}, tasks::{CompileTask, GenTask, RunTask},
utils::{log_failure, log_process, log_success}, utils::{log_failure, log_process, log_success},
}; };
pub fn main(_capture: bool, test_files: Vec<String>, includes: Vec<String>, args: Vec<String>) { pub fn main(_capture: bool, test_files: Vec<String>, includes: Vec<String>, args: Vec<String>) {
log_process("testing"); log_process("testing");
let main_file = Config::get_local_or_default().main_file();
let includes: Vec<_> = includes.into_iter().map(PathBuf::from).collect(); let includes: Vec<_> = includes.into_iter().map(PathBuf::from).collect();
for path in test_files { for path in test_files {
let content = fs::read_to_string(&path).unwrap(); let content = fs::read_to_string(&path).unwrap();
@ -20,7 +22,7 @@ pub fn main(_capture: bool, test_files: Vec<String>, includes: Vec<String>, args
// compile with all files // compile with all files
let mut files = vec![generated_code]; let mut files = vec![generated_code];
let mut local_includes = includes.clone(); let mut local_includes = includes.clone(); // TODO : filter out current test : already included
files.append(&mut local_includes); files.append(&mut local_includes);
let mut task = CompileTask::new(files); let mut task = CompileTask::new(files);
for flag in args.clone() { for flag in args.clone() {
@ -58,6 +60,8 @@ int main(int argc, char** argv) {{
return 0; return 0;
}} }}
#define main __pi_hidden_main
#include \"{path}\" #include \"{path}\"
void __pi_test() {{ void __pi_test() {{