diff --git a/sv-parser-pp/src/preprocess.rs b/sv-parser-pp/src/preprocess.rs index 572127a..8564242 100644 --- a/sv-parser-pp/src/preprocess.rs +++ b/sv-parser-pp/src/preprocess.rs @@ -916,7 +916,7 @@ mod tests { fn include_origin() { let include_paths = [testfile_path("")]; let (ret, _) = preprocess( - testfile_path("test2.sv"), + testfile_path("include_origin.sv"), &HashMap::new(), &include_paths, false, @@ -925,11 +925,11 @@ mod tests { .unwrap(); assert_eq!( ret.text(), - testfile_contents("expected/include_origin") + testfile_contents("expected/include_origin.sv") ); assert_eq!( ret.origin(10).unwrap().0, - &PathBuf::from(testfile_path("test2.sv")) + &PathBuf::from(testfile_path("include_origin.sv")) ); assert_eq!(ret.origin(10).unwrap().1, 10); assert_eq!( @@ -939,16 +939,16 @@ mod tests { assert_eq!(ret.origin(50).unwrap().1, 73); assert_eq!( ret.origin(70).unwrap().0, - &PathBuf::from(testfile_path("test2.sv")) + &PathBuf::from(testfile_path("include_origin.sv")) ); assert_eq!(ret.origin(70).unwrap().1, 50); } #[test] - fn ignore_include() { + fn include_ignore() { let include_paths = [testfile_path("")]; let (ret, _) = preprocess( - testfile_path("test2.sv"), + testfile_path("include_ignore.sv"), &HashMap::new(), &include_paths, false, @@ -957,7 +957,7 @@ mod tests { .unwrap(); assert_eq!( ret.text(), - testfile_contents("expected/ignore_include") + testfile_contents("expected/include_ignore.sv") ); } diff --git a/sv-parser-pp/testcases/expected/ignore_include b/sv-parser-pp/testcases/expected/include_include.sv similarity index 100% rename from sv-parser-pp/testcases/expected/ignore_include rename to sv-parser-pp/testcases/expected/include_include.sv diff --git a/sv-parser-pp/testcases/expected/include_origin b/sv-parser-pp/testcases/expected/include_origin.sv similarity index 100% rename from sv-parser-pp/testcases/expected/include_origin rename to sv-parser-pp/testcases/expected/include_origin.sv diff --git a/sv-parser-pp/testcases/test2.sv b/sv-parser-pp/testcases/include_ignore.sv similarity index 100% rename from sv-parser-pp/testcases/test2.sv rename to sv-parser-pp/testcases/include_ignore.sv diff --git a/sv-parser-pp/testcases/include_origin.sv b/sv-parser-pp/testcases/include_origin.sv new file mode 100644 index 0000000..873c201 --- /dev/null +++ b/sv-parser-pp/testcases/include_origin.sv @@ -0,0 +1,3 @@ +module and_op (a, b, c); +`include "test2.svh" +endmodule