seanyoung
diff --git a/Diff for: ‎Cargo.toml
+12-43 b/Diff for: ‎Cargo.toml
+12-43
diff --git a/Diff for: ‎cir/Cargo.toml
+36 b/Diff for: ‎cir/Cargo.toml
+36
diff --git a/Diff for: ‎src/bin/cir.rs renamed to ‎cir/src/bin/cir.rs b/Diff for: ‎src/bin/cir.rs renamed to ‎cir/src/bin/cir.rs
diff --git a/Diff for: ‎src/bin/commands/config.rs renamed to ‎cir/src/bin/commands/config.rs b/Diff for: ‎src/bin/commands/config.rs renamed to ‎cir/src/bin/commands/config.rs
diff --git a/Diff for: ‎src/bin/commands/decode.rs renamed to ‎cir/src/bin/commands/decode.rs b/Diff for: ‎src/bin/commands/decode.rs renamed to ‎cir/src/bin/commands/decode.rs
diff --git a/Diff for: ‎src/bin/commands/list.rs renamed to ‎cir/src/bin/commands/list.rs b/Diff for: ‎src/bin/commands/list.rs renamed to ‎cir/src/bin/commands/list.rs
diff --git a/Diff for: ‎src/bin/commands/mod.rs renamed to ‎cir/src/bin/commands/mod.rs b/Diff for: ‎src/bin/commands/mod.rs renamed to ‎cir/src/bin/commands/mod.rs
diff --git a/Diff for: ‎src/bin/commands/test.rs renamed to ‎cir/src/bin/commands/test.rs b/Diff for: ‎src/bin/commands/test.rs renamed to ‎cir/src/bin/commands/test.rs
diff --git a/Diff for: ‎src/bin/commands/transmit.rs renamed to ‎cir/src/bin/commands/transmit.rs b/Diff for: ‎src/bin/commands/transmit.rs renamed to ‎cir/src/bin/commands/transmit.rs
diff --git a/Diff for: ‎src/keymap/decode.rs renamed to ‎cir/src/keymap/decode.rs b/Diff for: ‎src/keymap/decode.rs renamed to ‎cir/src/keymap/decode.rs
diff --git a/Diff for: ‎src/keymap/encode.rs renamed to ‎cir/src/keymap/encode.rs b/Diff for: ‎src/keymap/encode.rs renamed to ‎cir/src/keymap/encode.rs
diff --git a/Diff for: ‎src/keymap/mod.rs renamed to ‎cir/src/keymap/mod.rs b/Diff for: ‎src/keymap/mod.rs renamed to ‎cir/src/keymap/mod.rs
diff --git a/Diff for: ‎src/keymap/parse.rs renamed to ‎cir/src/keymap/parse.rs b/Diff for: ‎src/keymap/parse.rs renamed to ‎cir/src/keymap/parse.rs
diff --git a/Diff for: ‎src/keymap/protocol.rs renamed to ‎cir/src/keymap/protocol.rs b/Diff for: ‎src/keymap/protocol.rs renamed to ‎cir/src/keymap/protocol.rs
diff --git a/Diff for: ‎src/lib.rs renamed to ‎cir/src/lib.rs b/Diff for: ‎src/lib.rs renamed to ‎cir/src/lib.rs
diff --git a/Diff for: ‎src/lirc.rs renamed to ‎cir/src/lirc.rs b/Diff for: ‎src/lirc.rs renamed to ‎cir/src/lirc.rs
diff --git a/Diff for: ‎src/lircd_conf/decode.rs renamed to ‎cir/src/lircd_conf/decode.rs b/Diff for: ‎src/lircd_conf/decode.rs renamed to ‎cir/src/lircd_conf/decode.rs
diff --git a/Diff for: ‎src/lircd_conf/encode.rs renamed to ‎cir/src/lircd_conf/encode.rs b/Diff for: ‎src/lircd_conf/encode.rs renamed to ‎cir/src/lircd_conf/encode.rs
diff --git a/Diff for: ‎src/lircd_conf/irp.rs renamed to ‎cir/src/lircd_conf/irp.rs b/Diff for: ‎src/lircd_conf/irp.rs renamed to ‎cir/src/lircd_conf/irp.rs
diff --git a/Diff for: ‎src/lircd_conf/mod.rs renamed to ‎cir/src/lircd_conf/mod.rs b/Diff for: ‎src/lircd_conf/mod.rs renamed to ‎cir/src/lircd_conf/mod.rs
diff --git a/Diff for: ‎src/lircd_conf/parse.rs renamed to ‎cir/src/lircd_conf/parse.rs b/Diff for: ‎src/lircd_conf/parse.rs renamed to ‎cir/src/lircd_conf/parse.rs
diff --git a/Diff for: ‎src/rc_maps.rs renamed to ‎cir/src/rc_maps.rs b/Diff for: ‎src/rc_maps.rs renamed to ‎cir/src/rc_maps.rs
diff --git a/Diff for: ‎src/rcdev.rs renamed to ‎cir/src/rcdev.rs
+3-3 b/Diff for: ‎src/rcdev.rs renamed to ‎cir/src/rcdev.rs
+3-3
diff --git a/Diff for: ‎tests/decode_tests.rs renamed to ‎cir/tests/decode_tests.rs
+7-7 b/Diff for: ‎tests/decode_tests.rs renamed to ‎cir/tests/decode_tests.rs
+7-7
diff --git a/Diff for: ‎tests/encode_tests.rs renamed to ‎cir/tests/encode_tests.rs
+10-10 b/Diff for: ‎tests/encode_tests.rs renamed to ‎cir/tests/encode_tests.rs
+10-10
diff --git a/Diff for: ‎tests/irctl_encode.rs renamed to ‎cir/tests/irctl_encode.rs
+1-1 b/Diff for: ‎tests/irctl_encode.rs renamed to ‎cir/tests/irctl_encode.rs
+1-1
diff --git a/Diff for: ‎tests/lircd_conf_tests.rs renamed to ‎cir/tests/lircd_conf_tests.rs
+7-6 b/Diff for: ‎tests/lircd_conf_tests.rs renamed to ‎cir/tests/lircd_conf_tests.rs
+7-6
diff --git a/Diff for: ‎irp/Cargo.toml
+2-2 b/Diff for: ‎irp/Cargo.toml
+2-2
diff --git a/Diff for: ‎irp/tests/encoder_fuzzer/Cargo.toml
+1-1 b/Diff for: ‎irp/tests/encoder_fuzzer/Cargo.toml
+1-1
diff --git a/Diff for: ‎tests/libirctl/Cargo.toml renamed to ‎libirctl/Cargo.toml b/Diff for: ‎tests/libirctl/Cargo.toml renamed to ‎libirctl/Cargo.toml
diff --git a/Diff for: ‎tests/libirctl/build.rs renamed to ‎libirctl/build.rs b/Diff for: ‎tests/libirctl/build.rs renamed to ‎libirctl/build.rs
diff --git a/Diff for: ‎tests/libirctl/src/bpf_encoder.c renamed to ‎libirctl/src/bpf_encoder.c b/Diff for: ‎tests/libirctl/src/bpf_encoder.c renamed to ‎libirctl/src/bpf_encoder.c
diff --git a/Diff for: ‎tests/libirctl/src/bpf_encoder.h renamed to ‎libirctl/src/bpf_encoder.h b/Diff for: ‎tests/libirctl/src/bpf_encoder.h renamed to ‎libirctl/src/bpf_encoder.h
diff --git a/Diff for: ‎tests/libirctl/src/ir-encode.c renamed to ‎libirctl/src/ir-encode.c b/Diff for: ‎tests/libirctl/src/ir-encode.c renamed to ‎libirctl/src/ir-encode.c
diff --git a/Diff for: ‎tests/libirctl/src/ir-encode.h renamed to ‎libirctl/src/ir-encode.h b/Diff for: ‎tests/libirctl/src/ir-encode.h renamed to ‎libirctl/src/ir-encode.h
diff --git a/Diff for: ‎tests/libirctl/src/keymap.c renamed to ‎libirctl/src/keymap.c b/Diff for: ‎tests/libirctl/src/keymap.c renamed to ‎libirctl/src/keymap.c
diff --git a/Diff for: ‎tests/libirctl/src/keymap.h renamed to ‎libirctl/src/keymap.h b/Diff for: ‎tests/libirctl/src/keymap.h renamed to ‎libirctl/src/keymap.h
diff --git a/Diff for: ‎tests/libirctl/src/lib.rs renamed to ‎libirctl/src/lib.rs b/Diff for: ‎tests/libirctl/src/lib.rs renamed to ‎libirctl/src/lib.rs
diff --git a/Diff for: ‎tests/libirctl/src/lirc.h renamed to ‎libirctl/src/lirc.h b/Diff for: ‎tests/libirctl/src/lirc.h renamed to ‎libirctl/src/lirc.h
diff --git a/Diff for: ‎tests/libirctl/src/toml.c renamed to ‎libirctl/src/toml.c b/Diff for: ‎tests/libirctl/src/toml.c renamed to ‎libirctl/src/toml.c
diff --git a/Diff for: ‎tests/libirctl/src/toml.h renamed to ‎libirctl/src/toml.h b/Diff for: ‎tests/libirctl/src/toml.h renamed to ‎libirctl/src/toml.h
diff --git a/Diff for: ‎tests/liblircd/Cargo.toml renamed to ‎liblircd/Cargo.toml b/Diff for: ‎tests/liblircd/Cargo.toml renamed to ‎liblircd/Cargo.toml
diff --git a/Diff for: ‎tests/liblircd/build.rs renamed to ‎liblircd/build.rs b/Diff for: ‎tests/liblircd/build.rs renamed to ‎liblircd/build.rs
diff --git a/Diff for: ‎tests/liblircd/src/config_file.c renamed to ‎liblircd/src/config_file.c b/Diff for: ‎tests/liblircd/src/config_file.c renamed to ‎liblircd/src/config_file.c
diff --git a/Diff for: ‎tests/liblircd/src/config_file.h renamed to ‎liblircd/src/config_file.h b/Diff for: ‎tests/liblircd/src/config_file.h renamed to ‎liblircd/src/config_file.h
diff --git a/Diff for: ‎tests/liblircd/src/config_flags.h renamed to ‎liblircd/src/config_flags.h b/Diff for: ‎tests/liblircd/src/config_flags.h renamed to ‎liblircd/src/config_flags.h
diff --git a/Diff for: ‎tests/liblircd/src/driver.c renamed to ‎liblircd/src/driver.c b/Diff for: ‎tests/liblircd/src/driver.c renamed to ‎liblircd/src/driver.c
diff --git a/Diff for: ‎tests/liblircd/src/driver.h renamed to ‎liblircd/src/driver.h b/Diff for: ‎tests/liblircd/src/driver.h renamed to ‎liblircd/src/driver.h
diff --git a/Diff for: ‎tests/liblircd/src/ir_remote.c renamed to ‎liblircd/src/ir_remote.c b/Diff for: ‎tests/liblircd/src/ir_remote.c renamed to ‎liblircd/src/ir_remote.c
diff --git a/Diff for: ‎tests/liblircd/src/ir_remote.h renamed to ‎liblircd/src/ir_remote.h b/Diff for: ‎tests/liblircd/src/ir_remote.h renamed to ‎liblircd/src/ir_remote.h
diff --git a/Diff for: ‎tests/liblircd/src/ir_remote_types.h renamed to ‎liblircd/src/ir_remote_types.h b/Diff for: ‎tests/liblircd/src/ir_remote_types.h renamed to ‎liblircd/src/ir_remote_types.h
diff --git a/Diff for: ‎tests/liblircd/src/lib.rs renamed to ‎liblircd/src/lib.rs b/Diff for: ‎tests/liblircd/src/lib.rs renamed to ‎liblircd/src/lib.rs
diff --git a/Diff for: ‎tests/liblircd/src/lirc.h renamed to ‎liblircd/src/lirc.h b/Diff for: ‎tests/liblircd/src/lirc.h renamed to ‎liblircd/src/lirc.h
diff --git a/Diff for: ‎tests/liblircd/src/lirc_log.c renamed to ‎liblircd/src/lirc_log.c b/Diff for: ‎tests/liblircd/src/lirc_log.c renamed to ‎liblircd/src/lirc_log.c
diff --git a/Diff for: ‎tests/liblircd/src/lirc_log.h renamed to ‎liblircd/src/lirc_log.h b/Diff for: ‎tests/liblircd/src/lirc_log.h renamed to ‎liblircd/src/lirc_log.h
diff --git a/Diff for: ‎tests/liblircd/src/receive.c renamed to ‎liblircd/src/receive.c b/Diff for: ‎tests/liblircd/src/receive.c renamed to ‎liblircd/src/receive.c
diff --git a/Diff for: ‎tests/liblircd/src/receive.h renamed to ‎liblircd/src/receive.h b/Diff for: ‎tests/liblircd/src/receive.h renamed to ‎liblircd/src/receive.h
diff --git a/Diff for: ‎tests/liblircd/src/transmit.c renamed to ‎liblircd/src/transmit.c b/Diff for: ‎tests/liblircd/src/transmit.c renamed to ‎liblircd/src/transmit.c
diff --git a/Diff for: ‎tests/liblircd/src/transmit.h renamed to ‎liblircd/src/transmit.h b/Diff for: ‎tests/liblircd/src/transmit.h renamed to ‎liblircd/src/transmit.h
diff --git a/Diff for: ‎tests/liblircd/tests/transmit.rs renamed to ‎liblircd/tests/transmit.rs
+5-5 b/Diff for: ‎tests/liblircd/tests/transmit.rs renamed to ‎liblircd/tests/transmit.rs
+5-5
diff --git a/Diff for: ‎tests/lirc_compare/.gitignore renamed to ‎lirc_compare/.gitignore b/Diff for: ‎tests/lirc_compare/.gitignore renamed to ‎lirc_compare/.gitignore
diff --git a/Diff for: ‎lirc_compare/Cargo.toml
+10 b/Diff for: ‎lirc_compare/Cargo.toml
+10
diff --git a/Diff for: ‎tests/lirc_compare/src/main.rs renamed to ‎lirc_compare/src/main.rs b/Diff for: ‎tests/lirc_compare/src/main.rs renamed to ‎lirc_compare/src/main.rs
@@ -1,51 +1,20 @@
-[package]
-name = "cir"
-version = "0.1.3"
-authors = ["Sean Young <[email protected]>"]
-repository = "https://github.com/seanyoung/cir"
-edition = "2021"
-description = "Linux Infrared Tooling"
-license = "MIT"
-rust-version = "1.74.0"
-exclude = [ "/.git*", "/testdata", "/tests", "/TODO" ]
-
-[dependencies]
-clap = { version = "4.5", features = [ "derive" ] }
-toml = "0.8"
-itertools = "0.12"
-bitflags = "2.5"
-num-integer = "0.1"
-terminal_size = "0.3"
-log = "0.4"
-peg = "0.8"
-
-[target.'cfg(target_os = "linux")'.dependencies]
-evdev = { git = "https://github.com/emberian/evdev" }
-nix = { version = "0.28", features = [ "fs", "ioctl", "poll" ] }
-aya = { git = "https://github.com/aya-rs/aya.git" }
-irp = { version = "0.3.3", path = "irp", features = [ "bpf" ] }
-
-[target.'cfg(not(target_os = "linux"))'.dependencies]
-irp = { version = "0.3.3", path = "irp" }
-
-[dev-dependencies]
-assert_cmd = "2.0"
-serde_json = "1.0"
-liblircd = { path = "tests/liblircd" }
-libirctl = { path = "tests/libirctl" }
-rand = "0.8"
-
 [workspace]
 members = [
 	"irp",
-	"tests/liblircd",
-	"tests/libirctl",
-	"irp/tests/rust-irptransmogrifier",
+	"cir",
+	"transmogrifier_compare",
+	"lirc_compare",
+]
+default-members = [
+	"irp",
+	"cir",
 ]
+resolver = "2"
 
-[features]
-default = []
-loopback-tests = []
+[workspace.dependencies]
+libirctl = { path = "libirctl" }
+liblircd = { path = "liblircd" }
+irptransmogrifier = { path = "rust-irptransmogrifier" }
 
 [profile.release]
 lto = true
 
@@ -0,0 +1,36 @@
+[package]
+name = "cir"
+version = "0.1.3"
+authors = ["Sean Young <[email protected]>"]
+repository = "https://github.com/seanyoung/cir"
+edition = "2021"
+description = "Linux Infrared Tooling"
+license = "MIT"
+rust-version = "1.74.0"
+exclude = [ "/tests" ]
+
+[dependencies]
+clap = { version = "4.5", features = [ "derive" ] }
+toml = "0.8"
+itertools = "0.12"
+bitflags = "2.5"
+num-integer = "0.1"
+terminal_size = "0.3"
+log = "0.4"
+peg = "0.8"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+evdev = { git = "https://github.com/emberian/evdev" }
+nix = { version = "0.28", features = [ "fs", "ioctl", "poll" ] }
+aya = { git = "https://github.com/aya-rs/aya.git" }
+irp = { version = "0.3.3", path = "../irp", features = [ "bpf" ] }
+
+[target.'cfg(not(target_os = "linux"))'.dependencies]
+irp = { version = "0.3.3", path = "../irp" }
+
+[dev-dependencies]
+assert_cmd = "2.0"
+serde_json = "1.0"
+liblircd = { workspace = true }
+libirctl = { workspace = true }
+rand = "0.8"
@@ -230,17 +230,17 @@ mod tests {
 
     #[test]
     fn parse_bad() {
-        let e = parse_rc_maps_file(&PathBuf::from("testdata/rc_maps_cfg/bad.cfg")).unwrap_err();
+        let e = parse_rc_maps_file(&PathBuf::from("../testdata/rc_maps_cfg/bad.cfg")).unwrap_err();
 
         assert_eq!(
             format!("{e}"),
-            "testdata/rc_maps_cfg/bad.cfg:4: error: invalid parameters"
+            "../testdata/rc_maps_cfg/bad.cfg:4: error: invalid parameters"
         );
     }
 
     #[test]
     fn parse_good() {
-        let t = parse_rc_maps_file(&PathBuf::from("testdata/rc_maps_cfg/ttusbir.cfg")).unwrap();
+        let t = parse_rc_maps_file(&PathBuf::from("../testdata/rc_maps_cfg/ttusbir.cfg")).unwrap();
 
         assert_eq!(t.len(), 2);
 
 
@@ -6,7 +6,7 @@ fn toggle_bit_mask() {
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/lircd_conf/d-link/DSM-10.lircd.conf", "-q", "-r",
+            "decode", "keymap", "../testdata/lircd_conf/d-link/DSM-10.lircd.conf", "-q", "-r",
             "+9132 -4396 +664 -460 +664 -460 +664 -460 +664 -1592 +664 -460 +664 -460 +664 -460 +664 -460 +664 -460 +664 -1592 +664 -1592 +664 -460 +664 -460 +664 -1592 +664 -1592 +664 -1592 +664 -460 +664 -460 +664 -1592 +664 -460 +664 -1592 +664 -460 +664 -460 +664 -460 +664 -1592 +664 -1592 +664 -460 +664 -1592 +664 -460 +664 -1592 +664 -1592 +664 -1592 +671 -42232 +9128 -2143 +671 -96305"
         ])
         .assert();
@@ -33,7 +33,7 @@ fn ignore_mask() {
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/lircd_conf/apple/A1156.lircd.conf", "-q", "-r",
+            "decode", "keymap", "../testdata/lircd_conf/apple/A1156.lircd.conf", "-q", "-r",
             "+9065 -4484 +574 -547 +574 -1668 +574 -1668 +574 -1668 +574 -547 +574 -1668 +574 -1668 +574 -1668 +574 -1668 +574 -1668 +574 -1668 +574 -547 +574 -547 +574 -547 +574 -547 +574 -1668 +574 -547 +574 -1668 +574 -1668 +574 -547 +574 -547 +574 -547 +574 -547 +574 -547 +574 -1668 +574 -1668 +574 -547 +574 -547 +574 -547 +574 -1668 +574 -547 +574 -1668 +567 -37600 +9031 -2242 +567 -37600"
         ])
         .assert();
@@ -56,7 +56,7 @@ decoded: remote:Apple_A1156 code:KEY_PLAY
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/lircd_conf/apple/A1156.lircd.conf", "-q", "-r",
+            "decode", "keymap", "../testdata/lircd_conf/apple/A1156.lircd.conf", "-q", "-r",
             "+9065 -4484 +574 -547 +574 -1668 +574 -1668 +574 -1668 +574 -547 +574 -1668 +574 -1668 +574 -1668 +574 -1668 +574 -1668 +574 -1668 +574 -547 +574 -547 +574 -547 +574 -547 +574 -1668 +574 -547 +574 -1668 +574 -1668 +574 -547 +574 -547 +574 -547 +574 -547 +574 -547 +574 -547 +574 -547 +574 -1668 +574 -1668 +574 -1668 +574 -547 +574 -1668 +574 -547 +567 -37600 +9031 -2242 +567 -37600"
         ])
         .assert();
@@ -82,7 +82,7 @@ fn keymap() {
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/rc_keymaps/sony.toml", "-v", "-r",
+            "decode", "keymap", "../testdata/rc_keymaps/sony.toml", "-v", "-r",
             "+2400 -600 +600 -600 +600 -600 +600 -600 +600 -600 +600 -600 +1200 -600 +1200 -600 +600 -600 +600 -600 +600 -600 +600 -600 +1200 -26400"
         ])
         .assert();
@@ -111,7 +111,7 @@ info: decoding: +2400 -600 +600 -600 +600 -600 +600 -600 +600 -600 +600 -600 +12
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/rc_keymaps/dish_network.toml", "-q", "-r",
+            "decode", "keymap", "../testdata/rc_keymaps/dish_network.toml", "-q", "-r",
             "+525 -6045 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -1645 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +440 -2780 +450 -40000"
         ])
         .assert();
@@ -133,7 +133,7 @@ info: decoding: +2400 -600 +600 -600 +600 -600 +600 -600 +600 -600 +600 -600 +12
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/rc_keymaps/rc6_mce.toml", "-q", "-r",
+            "decode", "keymap", "../testdata/rc_keymaps/rc6_mce.toml", "-q", "-r",
             "+2664 -888 +444 -444 +444 -444 +444 -888 +444 -888 +1332 -888 +444 -444 +444 -444 +444 -444 +444 -444 +444 -444 +444 -444 +444 -444 +444 -444 +444 -444 +444 -444 +888 -444 +444 -444 +444 -444 +444 -888 +444 -444 +444 -444 +444 -444 +444 -444 +888 -888 +444 -444 +444 -444 +888 -888 +888 -444 +444 -444 +444 -888 +444 -444 +444 -67704"
         ])
         .assert();
@@ -155,7 +155,7 @@ info: decoding: +2400 -600 +600 -600 +600 -600 +600 -600 +600 -600 +600 -600 +12
 
     let assert = cmd
         .args([
-            "decode", "keymap", "testdata/rc_keymaps/RM-786.toml", "-r",
+            "decode", "keymap", "../testdata/rc_keymaps/RM-786.toml", "-r",
             "+2465 -569 +620 -582 +618 -584 +1242 -581 +618 -585 +620 -583 +620 -585 +1242 -607 +622 -575 +1243 -584 +1243 -578 +621 -579 +619 -20000"
         ])
         .assert();
 
@@ -38,7 +38,7 @@ fn encode_lircd_raw_test() {
             "transmit",
             "--dry-run",
             "keymap",
-            "testdata/lircd_conf/pace/DC420N.lircd.conf",
+            "../testdata/lircd_conf/pace/DC420N.lircd.conf",
             "1",
         ])
         .assert();
@@ -68,7 +68,7 @@ fn encode_lircd_aiwa_test() {
             "transmit",
             "--dry-run",
             "keymap",
-            "testdata/lircd_conf/aiwa/RC-5VP05.lircd.conf",
+            "../testdata/lircd_conf/aiwa/RC-5VP05.lircd.conf",
             "AUTO",
         ])
         .assert();
@@ -124,15 +124,15 @@ fn encode_rawir_test() {
             "--dry-run",
             "rawir",
             "-f",
-            "testdata/rawir/mode2",
+            "../testdata/rawir/mode2",
             "345",
             "-g",
             "30000",
             "+123 40 124",
             "-g",
             "40000",
             "-f",
-            "testdata/rawir/rawir",
+            "../testdata/rawir/rawir",
         ])
         .assert();
 
@@ -159,7 +159,7 @@ fn encode_lircd_grundig_test() {
             "transmit",
             "--dry-run",
             "keymap",
-            "testdata/lircd_conf/grundig/RP75_LCD.lircd.conf",
+            "../testdata/lircd_conf/grundig/RP75_LCD.lircd.conf",
             "-m",
             "grundig_rp75",
             "0",
@@ -190,7 +190,7 @@ fn empty_lircd_conf() {
             "transmit",
             "--dry-run",
             "keymap",
-            "testdata/lircd_conf/empty",
+            "../testdata/lircd_conf/empty",
         ])
         .assert();
 
@@ -203,7 +203,7 @@ fn empty_lircd_conf() {
 
     assert_eq!(
         stderr,
-        r#"error: testdata/lircd_conf/empty: parse error at error at 1:3: expected "table"
+        r#"error: ../testdata/lircd_conf/empty: parse error at error at 1:3: expected "table"
 "#
     );
 }
@@ -218,7 +218,7 @@ fn keymaps() {
             "--dry-run",
             "-v",
             "keymap",
-            "testdata/rc_keymaps/RM-687C.toml",
+            "../testdata/rc_keymaps/RM-687C.toml",
             "KEY_0",
         ])
         .assert();
@@ -245,7 +245,7 @@ info: rawir: +2369 -637 +1166 -637 +565 -637 +565 -637 +1166 -637 +565 -637 +565
             "transmit",
             "--dry-run",
             "keymap",
-            "testdata/rc_keymaps/RM-786.toml",
+            "../testdata/rc_keymaps/RM-786.toml",
             "KEY_CABLEFWD",
         ])
         .assert();
@@ -320,7 +320,7 @@ info: rawir: +2369 -637 +1166 -637 +565 -637 +565 -637 +1166 -637 +565 -637 +565
             "transmit",
             "--dry-run",
             "keymap",
-            "testdata/rc_keymaps/rc6_mce.toml",
+            "../testdata/rc_keymaps/rc6_mce.toml",
             "KEY_ENTER",
             "-v",
         ])
 
@@ -55,7 +55,7 @@ fn irctl_compare_encode(path: &Path, scancode: u32, our_keymap: &Keymap) {
 
 #[test]
 fn keymap_encode() {
-    recurse(Path::new("testdata/rc_keymaps"));
+    recurse(Path::new("../testdata/rc_keymaps"));
 }
 
 fn recurse(path: &Path) {
 
@@ -10,7 +10,7 @@ use std::{
 
 #[test]
 fn lircd_testdata() {
-    recurse(&PathBuf::from("testdata/lircd_conf"));
+    recurse(&PathBuf::from("../testdata/lircd_conf"));
 }
 
 fn recurse(path: &Path) {
@@ -164,19 +164,20 @@ fn lircd_encode_decode(path: &Path) {
 
                 // let's see if lircd can decode its own creation
 
-                if path == OsStr::new("testdata/lircd_conf/creative/livedrive.lircd.conf") {
+                if path == OsStr::new("../testdata/lircd_conf/creative/livedrive.lircd.conf") {
                     // not decodable, missing ptrail
                     continue;
                 }
 
-                if path == OsStr::new("testdata/lircd_conf/meridian/MSR.lircd.conf") {
+                if path == OsStr::new("../testdata/lircd_conf/meridian/MSR.lircd.conf") {
                     // not decodable, missing plead/header
                     continue;
                 }
 
-                if path == OsStr::new("testdata/lircd_conf/logitech/logitech.lircd.conf")
-                    || path == OsStr::new("testdata/lircd_conf/pcmak/pcmak.lircd.conf")
-                    || path == OsStr::new("testdata/lircd_conf/pixelview/remotemaster.lircd.conf")
+                if path == OsStr::new("../testdata/lircd_conf/logitech/logitech.lircd.conf")
+                    || path == OsStr::new("../testdata/lircd_conf/pcmak/pcmak.lircd.conf")
+                    || path
+                        == OsStr::new("../testdata/lircd_conf/pixelview/remotemaster.lircd.conf")
                 {
                     // not decodable, leading space (both lircd and irp crate)
                     continue;
 
@@ -27,8 +27,8 @@ inkwell = { version = "0.4", features = [ "target-bpf", "llvm15-0-force-dynamic"
 bpf = [ "inkwell" ]
 
 [dev-dependencies]
-cir = { path = ".." }
+cir = { path = "../cir" }
 rand = "0.8"
-irptransmogrifier = { path = "tests/rust-irptransmogrifier" }
+irptransmogrifier = { workspace = true }
 aya-obj = { version = "0.1", features = [ "std" ] }
 rbpf = "0.2"
@@ -7,7 +7,7 @@ publish = false
 [dependencies]
 afl = "*"
 irp = { path = "../.." }
-irptransmogrifier = { path = "../rust-irptransmogrifier" }
+irptransmogrifier = { path = "../../../rust-irptransmogrifier" }
 rand = "0.8"
 
 [workspace]
@@ -3,7 +3,7 @@ use std::fs::read_to_string;
 
 #[test]
 fn encode() {
-    let conf = read_to_string("../../testdata/lircd_conf/thomson/ROC740.lircd.conf").unwrap();
+    let conf = read_to_string("../testdata/lircd_conf/thomson/ROC740.lircd.conf").unwrap();
 
     //unsafe { lirc_log_set_stdout() };
 
@@ -37,7 +37,7 @@ fn encode() {
         }
     }
 
-    let conf = read_to_string("../../testdata/lircd_conf/motorola/DCH3200.lircd.conf").unwrap();
+    let conf = read_to_string("../testdata/lircd_conf/motorola/DCH3200.lircd.conf").unwrap();
 
     // unsafe { lirc_log_set_stdout() };
 
@@ -70,7 +70,7 @@ fn encode() {
         }
     }
 
-    let conf = read_to_string("../../testdata/lircd_conf/motorola/QIP2500.lircd.conf").unwrap();
+    let conf = read_to_string("../testdata/lircd_conf/motorola/QIP2500.lircd.conf").unwrap();
 
     let conf = LircdConf::parse(&conf).unwrap();
 
@@ -110,7 +110,7 @@ fn encode() {
 
     // now test decode of a remote with toggle_bit_mask set (more than one bit)
 
-    let conf = read_to_string("../../testdata/lircd_conf/d-link/DSM-10.lircd.conf").unwrap();
+    let conf = read_to_string("../testdata/lircd_conf/d-link/DSM-10.lircd.conf").unwrap();
 
     //unsafe { lirc_log_set_stdout() };
 
@@ -163,7 +163,7 @@ fn encode() {
 
     // now test decoder of a remote with an ignore_mask
 
-    let conf = read_to_string("../../testdata/lircd_conf/apple/A1156.lircd.conf").unwrap();
+    let conf = read_to_string("../testdata/lircd_conf/apple/A1156.lircd.conf").unwrap();
 
     //unsafe { lirc_log_set_stdout() };
 
 
@@ -0,0 +1,10 @@
+[package]
+name = "lirc_compare"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+cir = { path = "../cir" }
+irp = { path = "../irp" }
+liblircd = { workspace = true }
+num-integer = "0.1"
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ fn irctl_compare_encode(path: &Path, scancode: u32, our_keymap: &Keymap) {`
`55`	`55`
`56`	`56`	`#[test]`
`57`	`57`	`fn keymap_encode() {`
`58`		`- recurse(Path::new("testdata/rc_keymaps"));`
	`58`	`+ recurse(Path::new("../testdata/rc_keymaps"));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`fn recurse(path: &Path) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use std::fs::read_to_string;`
`3`	`3`
`4`	`4`	`#[test]`
`5`	`5`	`fn encode() {`
`6`		`- let conf = read_to_string("../../testdata/lircd_conf/thomson/ROC740.lircd.conf").unwrap();`
	`6`	`+ let conf = read_to_string("../testdata/lircd_conf/thomson/ROC740.lircd.conf").unwrap();`
`7`	`7`
`8`	`8`	`//unsafe { lirc_log_set_stdout() };`
`9`	`9`
`@@ -37,7 +37,7 @@ fn encode() {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- let conf = read_to_string("../../testdata/lircd_conf/motorola/DCH3200.lircd.conf").unwrap();`
	`40`	`+ let conf = read_to_string("../testdata/lircd_conf/motorola/DCH3200.lircd.conf").unwrap();`
`41`	`41`
`42`	`42`	`// unsafe { lirc_log_set_stdout() };`
`43`	`43`
`@@ -70,7 +70,7 @@ fn encode() {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- let conf = read_to_string("../../testdata/lircd_conf/motorola/QIP2500.lircd.conf").unwrap();`
	`73`	`+ let conf = read_to_string("../testdata/lircd_conf/motorola/QIP2500.lircd.conf").unwrap();`
`74`	`74`
`75`	`75`	`let conf = LircdConf::parse(&conf).unwrap();`
`76`	`76`
`@@ -110,7 +110,7 @@ fn encode() {`
`110`	`110`
`111`	`111`	`// now test decode of a remote with toggle_bit_mask set (more than one bit)`
`112`	`112`
`113`		`- let conf = read_to_string("../../testdata/lircd_conf/d-link/DSM-10.lircd.conf").unwrap();`
	`113`	`+ let conf = read_to_string("../testdata/lircd_conf/d-link/DSM-10.lircd.conf").unwrap();`
`114`	`114`
`115`	`115`	`//unsafe { lirc_log_set_stdout() };`
`116`	`116`
`@@ -163,7 +163,7 @@ fn encode() {`
`163`	`163`
`164`	`164`	`// now test decoder of a remote with an ignore_mask`
`165`	`165`
`166`		`- let conf = read_to_string("../../testdata/lircd_conf/apple/A1156.lircd.conf").unwrap();`
	`166`	`+ let conf = read_to_string("../testdata/lircd_conf/apple/A1156.lircd.conf").unwrap();`
`167`	`167`
`168`	`168`	`//unsafe { lirc_log_set_stdout() };`
`169`	`169`