From 77235a19bc8537edc4b40d91f02ec20410950727 Mon Sep 17 00:00:00 2001 From: Void User Date: Thu, 23 Jun 2022 20:54:27 -0400 Subject: [PATCH] missed some files by committing in the wrong folder --- src/main.rs | 3 +++ src/test.rs | 2 ++ src/vcd/parse.rs | 36 ++---------------------------------- 3 files changed, 7 insertions(+), 34 deletions(-) create mode 100644 src/test.rs diff --git a/src/main.rs b/src/main.rs index 234f47a..45723cd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,9 @@ use std::fs::File; use clap::Parser; +pub mod test; +use test::*; + pub mod vcd; use vcd::*; diff --git a/src/test.rs b/src/test.rs new file mode 100644 index 0000000..18214a1 --- /dev/null +++ b/src/test.rs @@ -0,0 +1,2 @@ +mod files; +pub use files::*; \ No newline at end of file diff --git a/src/vcd/parse.rs b/src/vcd/parse.rs index b22bf71..816f22a 100644 --- a/src/vcd/parse.rs +++ b/src/vcd/parse.rs @@ -25,43 +25,11 @@ pub fn parse_vcd(file : File) { #[cfg(test)] mod tests { use super::*; + use crate::test; use std::fs::File; #[test] fn headers() { - let files = vec![ - "./test-vcd-files/aldec/SPI_Write.vcd", - "./test-vcd-files/ghdl/alu.vcd", - "./test-vcd-files/ghdl/idea.vcd", - "./test-vcd-files/ghdl/pcpu.vcd", - "./test-vcd-files/gtkwave-analyzer/perm_current.vcd", - "./test-vcd-files/icarus/CPU.vcd", - "./test-vcd-files/icarus/rv32_soc_TB.vcd", - "./test-vcd-files/icarus/test1.vcd", - "./test-vcd-files/model-sim/CPU_Design.msim.vcd", - "./test-vcd-files/model-sim/clkdiv2n_tb.vcd", - "./test-vcd-files/my-hdl/Simple_Memory.vcd", - "./test-vcd-files/my-hdl/sigmoid_tb.vcd", - "./test-vcd-files/my-hdl/top.vcd", - // "./test-vcd-files/ncsim/ffdiv_32bit_tb.vcd", - // "./test-vcd-files/quartus/mipsHardware.vcd", - // "./test-vcd-files/quartus/wave_registradores.vcd", - "./test-vcd-files/questa-sim/dump.vcd", - "./test-vcd-files/questa-sim/test.vcd", - "./test-vcd-files/riviera-pro/dump.vcd", - // "./test-vcd-files/systemc/waveform.vcd", - // "./test-vcd-files/treadle/GCD.vcd", - "./test-vcd-files/vcs/Apb_slave_uvm_new.vcd", - "./test-vcd-files/vcs/datapath_log.vcd", - "./test-vcd-files/vcs/processor.vcd", - "./test-vcd-files/verilator/swerv1.vcd", - "./test-vcd-files/verilator/vlt_dump.vcd", - // "./test-vcd-files/vivado/iladata.vcd", - "./test-vcd-files/xilinx_isim/test.vcd", - "./test-vcd-files/xilinx_isim/test1.vcd", - "./test-vcd-files/xilinx_isim/test2x2_regex22_string1.vcd" - ]; - - for file in files { + for file in test::files { let metadata = parse_metadata( &mut WordReader::new( File::open(file)