rust-rewrite: Ported c-funcpack generator tests to rust integration t…

…ests

.github/workflows/ci.yml

@@ -45,5 +45,9 @@ jobs:
         with:
           toolchain: stable
       - uses: carlosperate/arm-none-eabi-gcc-action@v1
-      - name: Run Generator tests.
-        run: bash ${{github.workspace}}/reginald_codegen/generator_tests/run_tests.bash
+      - name: Run old generator tests.
+        run: 
+          bash ${{github.workspace}}/reginald_codegen/generator_tests/run_tests.bash
+      - name: Run generator tests.
+        run: 
+          cargo test -- --ignored

.gitignore

@@ -7,3 +7,5 @@ out.c
 out.rs
 
 testproj/
+
+tarpaulin-report.html

justfile

@@ -1,9 +1,19 @@
-check:
+full_check:
     cargo test --workspace
     ./reginald_codegen/generator_tests/run_tests.bash
+    REGINALD_TEST_C_FUNCPACK_ADDITIONAL_COMPILERS=arm-none-eabi-gcc cargo test --workspace -- --ignored
+    cargo fmt --check
+    cargo clippy --all-features --workspace
+    @echo "ALL CHECKS OK"
+
+check:
+    cargo test --workspace
     cargo fmt --check
     cargo clippy --all-features --workspace
     @echo "ALL CHECKS OK"
 
 tokei:
     tokei --exclude Unity
+
+cov:
+    cargo tarpaulin --all-targets --doc --out Html -- --include-ignored

reginald_codegen/Cargo.toml

@@ -28,4 +28,5 @@ similar        = { version = "2.4.0",   features = ["inline"], optional = true }
 console        = { version = "0.15.8",  features = [],         optional = true }
 
 [dev-dependencies]
+tempfile          = "3.10.1"
 pretty_assertions = "1.4.0"

reginald_codegen/generator_tests/run_tests.bash

@@ -21,10 +21,6 @@ echo_cyan "=== COMPILE ==="
 cargo build
 echo_green "DONE"
 
-echo
-echo_cyan "=== TESTING C FUNCPACK ==="
-bash ./c_funcpack/run_test.bash || fail
-
 echo
 echo_cyan "=== TESTING RS STRUCTS ==="
 bash ./rs_structs/run_test.bash || fail

reginald_codegen/src/cli/cmd/completion.rs

@@ -1,7 +1,7 @@
 use std::io;
 
+use crate::error::Error;
 use clap::{CommandFactory, Parser};
-use reginald_codegen::error::Error;
 
 use crate::cli::Cli;
 

reginald_codegen/src/cli/cmd/gen.rs

@@ -1,12 +1,12 @@
 use std::fs;
 use std::path::PathBuf;
 
+use crate::builtin::c;
+use crate::builtin::md;
+use crate::builtin::rs;
+use crate::error::Error;
+use crate::regmap::RegisterMap;
 use clap::Parser;
-use reginald_codegen::builtin::c;
-use reginald_codegen::builtin::md;
-use reginald_codegen::builtin::rs;
-use reginald_codegen::error::Error;
-use reginald_codegen::regmap::RegisterMap;
 
 use crate::cli::diff;
 

reginald_codegen/src/cli/cmd/tool.rs

@@ -1,7 +1,7 @@
 use std::{fs, path::PathBuf};
 
+use crate::{builtin::rs::CONVERSION_TRAITS, error::Error};
 use clap::Parser;
-use reginald_codegen::{builtin::rs::CONVERSION_TRAITS, error::Error};
 
 #[derive(Parser, Debug)]
 #[command(about = "Built-in tools and utilities")]

reginald_codegen/src/cli/mod.rs

@@ -1,4 +1,4 @@
-mod cmd;
+pub mod cmd;
 mod diff;
 
 use std::process::ExitCode;

reginald_codegen/src/lib.rs

@@ -7,3 +7,6 @@ pub mod error;
 pub mod regmap;
 pub mod utils;
 pub mod writer;
+
+#[cfg(feature = "cli")]
+pub mod cli;

reginald_codegen/src/main.rs

@@ -1,8 +1,6 @@
+use reginald_codegen::cli;
 use std::process::ExitCode;
 
-#[cfg(feature = "cli")]
-mod cli;
-
 #[cfg(feature = "cli")]
 fn main() -> ExitCode {
     cli::cli_main()

reginald_codegen/generator_tests/c_funcpack/.gitignore → reginald_codegen/tests/generator_c_funcpack/.gitignore

@@ -1,3 +1,3 @@
-output/
+artifacts/
 .cache/
 compile_commands.json