Rust tests for new compiler

ci-rust

@@ -1,12 +1,16 @@
 #!/bin/sh
-
+set -eu
 . ./config
 
 mkdir -p "$TEST_OUT_DIR/rust"
 
-cd spec/rust
-mkdir src
-touch src/lib.rs
-cargo build
-cargo test-junit \
-      --name "../../$TEST_OUT_DIR/rust/results.xml"
+rm -rf "spec/rust/src"
+mkdir -p "spec/rust/src/"
+for rs in $(ls "$FORMATS_COMPILED_DIR/rust/"); do
+    cp "$FORMATS_COMPILED_DIR/rust/$rs" "spec/rust/src"
+    mod_name="$(echo "$rs" | cut -d'.' -f1)"
+    echo "pub mod $mod_name;" >> "spec/rust/src/lib.rs"
+done
+
+cd "spec/rust"
+cargo junit --name "../../$TEST_OUT_DIR/rust/results.xml"

spec/rust/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "rust"
+name = "kaitai_test"
 version = "0.1.0"
-authors = ["Connor Wood <[email protected]>"]
-build = "build.rs"
+authors = ["Connor Wood <[email protected]>", "Bradlee Speice<[email protected]>"]
+edition = "2018"
 
 [dependencies]
-kaitai_struct = { git = "https://github.com/CWood1/kaitai_struct_rust_runtime" }
+kaitai = { git = "https://github.com/bspeice/kaitai_rust" }

spec/rust/tests/test_bcd_user_type_be.rs

@@ -1,19 +1,19 @@
 // Autogenerated from KST: please remove this line if doing any edits by hand!
 
-extern crate kaitai_struct;
-extern crate rust;
-
-use kaitai_struct::KaitaiStruct;
-use rust::BcdUserTypeBe;
+use kaitai::{BytesReader, KStruct, KStructUnit};
+use kaitai_test::bcd_user_type_be::*;
+use std::fs;
 
 #[test]
 fn test_bcd_user_type_be() {
-    if let Ok(r) = BcdUserTypeBe::from_file("src/bcd_user_type_be.bin") {
-        assert_eq!(r.ltr.as_int, 12345678);
-        assert_eq!(r.ltr.as_str, "12345678");
-        assert_eq!(r.rtl.as_int, 87654321);
-        assert_eq!(r.rtl.as_str, "87654321");
-        assert_eq!(r.leading_zero_ltr.as_int, 123456);
-        assert_eq!(r.leading_zero_ltr.as_str, "00123456");
-    }
+    let data = fs::read("../../src/bcd_user_type_be.bin").expect("Unable to read data.");
+    let reader = BytesReader::new(&data[..]);
+    let mut r = BcdUserTypeBe::default();
+    r.read(&reader, None, KStructUnit::parent_stack()).expect("Unable to parse data.");
+    // assert_eq!(Attribute(Attribute(Name(identifier(q1w2e3)),identifier(ltr)),identifier(as_int)), IntNum(12345678))
+    // assert_eq!(Attribute(Attribute(Name(identifier(q1w2e3)),identifier(ltr)),identifier(as_str)), Str(12345678))
+    // assert_eq!(Attribute(Attribute(Name(identifier(q1w2e3)),identifier(rtl)),identifier(as_int)), IntNum(87654321))
+    // assert_eq!(Attribute(Attribute(Name(identifier(q1w2e3)),identifier(rtl)),identifier(as_str)), Str(87654321))
+    // assert_eq!(Attribute(Attribute(Name(identifier(q1w2e3)),identifier(leading_zero_ltr)),identifier(as_int)), IntNum(123456))
+    // assert_eq!(Attribute(Attribute(Name(identifier(q1w2e3)),identifier(leading_zero_ltr)),identifier(as_str)), Str(00123456))
 }