Move ir-ctl and lircd tests libraries into tests directory

Signed-off-by: Sean Young <[email protected]>
seanyoung · Apr 27, 2024 · 9881c7d · 9881c7d
1 parent 3388ce4
commit 9881c7d
Show file tree

Hide file tree

Showing 32 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,15 +33,15 @@ irp = { version = "0.3.2", path = "irp" }
 [dev-dependencies]
 assert_cmd = "2.0"
 serde_json = "1.0"
-liblircd = { path = "liblircd" }
-libirctl = { path = "libirctl" }
+liblircd = { path = "tests/liblircd" }
+libirctl = { path = "tests/libirctl" }
 rand = "0.8"
 
 [workspace]
 members = [
 	"irp",
-	"liblircd",
-	"libirctl",
+	"tests/liblircd",
+	"tests/libirctl",
 	"irp/tests/rust-irptransmogrifier",
 ]
 

diff --git a/libirctl/Cargo.toml → tests/libirctl/Cargo.toml b/libirctl/Cargo.toml → tests/libirctl/Cargo.toml
diff --git a/libirctl/build.rs → tests/libirctl/build.rs b/libirctl/build.rs → tests/libirctl/build.rs
diff --git a/libirctl/src/bpf_encoder.c → tests/libirctl/src/bpf_encoder.c b/libirctl/src/bpf_encoder.c → tests/libirctl/src/bpf_encoder.c
diff --git a/libirctl/src/bpf_encoder.h → tests/libirctl/src/bpf_encoder.h b/libirctl/src/bpf_encoder.h → tests/libirctl/src/bpf_encoder.h
diff --git a/libirctl/src/ir-encode.c → tests/libirctl/src/ir-encode.c b/libirctl/src/ir-encode.c → tests/libirctl/src/ir-encode.c
diff --git a/libirctl/src/ir-encode.h → tests/libirctl/src/ir-encode.h b/libirctl/src/ir-encode.h → tests/libirctl/src/ir-encode.h
diff --git a/libirctl/src/keymap.c → tests/libirctl/src/keymap.c b/libirctl/src/keymap.c → tests/libirctl/src/keymap.c
diff --git a/libirctl/src/keymap.h → tests/libirctl/src/keymap.h b/libirctl/src/keymap.h → tests/libirctl/src/keymap.h
diff --git a/libirctl/src/lib.rs → tests/libirctl/src/lib.rs b/libirctl/src/lib.rs → tests/libirctl/src/lib.rs
diff --git a/libirctl/src/lirc.h → tests/libirctl/src/lirc.h b/libirctl/src/lirc.h → tests/libirctl/src/lirc.h
diff --git a/libirctl/src/toml.c → tests/libirctl/src/toml.c b/libirctl/src/toml.c → tests/libirctl/src/toml.c
diff --git a/libirctl/src/toml.h → tests/libirctl/src/toml.h b/libirctl/src/toml.h → tests/libirctl/src/toml.h
diff --git a/liblircd/Cargo.toml → tests/liblircd/Cargo.toml b/liblircd/Cargo.toml → tests/liblircd/Cargo.toml
diff --git a/liblircd/build.rs → tests/liblircd/build.rs b/liblircd/build.rs → tests/liblircd/build.rs
diff --git a/liblircd/src/config_file.c → tests/liblircd/src/config_file.c b/liblircd/src/config_file.c → tests/liblircd/src/config_file.c
diff --git a/liblircd/src/config_file.h → tests/liblircd/src/config_file.h b/liblircd/src/config_file.h → tests/liblircd/src/config_file.h
diff --git a/liblircd/src/config_flags.h → tests/liblircd/src/config_flags.h b/liblircd/src/config_flags.h → tests/liblircd/src/config_flags.h
diff --git a/liblircd/src/driver.c → tests/liblircd/src/driver.c b/liblircd/src/driver.c → tests/liblircd/src/driver.c
diff --git a/liblircd/src/driver.h → tests/liblircd/src/driver.h b/liblircd/src/driver.h → tests/liblircd/src/driver.h
diff --git a/liblircd/src/ir_remote.c → tests/liblircd/src/ir_remote.c b/liblircd/src/ir_remote.c → tests/liblircd/src/ir_remote.c
diff --git a/liblircd/src/ir_remote.h → tests/liblircd/src/ir_remote.h b/liblircd/src/ir_remote.h → tests/liblircd/src/ir_remote.h
diff --git a/liblircd/src/ir_remote_types.h → tests/liblircd/src/ir_remote_types.h b/liblircd/src/ir_remote_types.h → tests/liblircd/src/ir_remote_types.h
diff --git a/liblircd/src/lib.rs → tests/liblircd/src/lib.rs b/liblircd/src/lib.rs → tests/liblircd/src/lib.rs
diff --git a/liblircd/src/lirc.h → tests/liblircd/src/lirc.h b/liblircd/src/lirc.h → tests/liblircd/src/lirc.h
diff --git a/liblircd/src/lirc_log.c → tests/liblircd/src/lirc_log.c b/liblircd/src/lirc_log.c → tests/liblircd/src/lirc_log.c
diff --git a/liblircd/src/lirc_log.h → tests/liblircd/src/lirc_log.h b/liblircd/src/lirc_log.h → tests/liblircd/src/lirc_log.h
diff --git a/liblircd/src/receive.c → tests/liblircd/src/receive.c b/liblircd/src/receive.c → tests/liblircd/src/receive.c
diff --git a/liblircd/src/receive.h → tests/liblircd/src/receive.h b/liblircd/src/receive.h → tests/liblircd/src/receive.h
diff --git a/liblircd/src/transmit.c → tests/liblircd/src/transmit.c b/liblircd/src/transmit.c → tests/liblircd/src/transmit.c
diff --git a/liblircd/src/transmit.h → tests/liblircd/src/transmit.h b/liblircd/src/transmit.h → tests/liblircd/src/transmit.h
diff --git a/liblircd/tests/transmit.rs → tests/liblircd/tests/transmit.rs b/liblircd/tests/transmit.rs → tests/liblircd/tests/transmit.rs
@@ -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() };