From abd7fe2d8243bc16f04c11a53ff25284c1e4001c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 28 Feb 2020 11:58:09 +0100 Subject: [PATCH] packaging cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- debian/compat | 1 - debian/debcargo.toml | 2 -- debian/rules | 29 ----------------------------- debian/source/format | 1 - tests/tests_after_queue.rs | 11 ++++++----- tests/tests_before_queue.rs | 10 +++++----- tests/utils.rs | 17 +++++++++++++++++ 7 files changed, 28 insertions(+), 43 deletions(-) delete mode 100644 debian/compat delete mode 100755 debian/rules delete mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/debcargo.toml b/debian/debcargo.toml index a0c1aae..0d94d65 100644 --- a/debian/debcargo.toml +++ b/debian/debcargo.toml @@ -4,8 +4,6 @@ crate_src_path = ".." [source] maintainer = "Proxmox Support Team " section = "admin" -build_depends = [ "debhelper (>= 12~)" ] -build_depends_excludes = [ "debhelper (>=11)" ] homepage = "http://www.proxmox.com" # TODO: vcs_git = "" diff --git a/debian/rules b/debian/rules deleted file mode 100755 index ab4ed21..0000000 --- a/debian/rules +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -DH_VERBOSE = 1 - -include /usr/share/dpkg/pkg-info.mk -include /usr/share/rustc/architecture.mk - -export BUILD_MODE=release - -CARGO=/usr/share/cargo/bin/cargo - -export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS -export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE -export CARGO_HOME = $(CURDIR)/debian/cargo_home - -export DEB_CARGO_CRATE=pmg-log-tracker$(DEB_VERSION_UPSTREAM) -export DEB_CARGO_PACKAGE=pmg-log-tracker - -%: - dh $@ - -override_dh_auto_configure: - $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system - dh_auto_configure - -override_dh_missing: - dh_missing --fail-missing - diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/tests/tests_after_queue.rs b/tests/tests_after_queue.rs index ac2b2e5..42d0f6b 100644 --- a/tests/tests_after_queue.rs +++ b/tests/tests_after_queue.rs @@ -1,11 +1,12 @@ use std::fs::File; use std::io::BufReader; use std::process::Command; + mod utils; #[test] fn after_queue_start_end_time_string() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("2020-12-18 15:40:00") @@ -26,7 +27,7 @@ fn after_queue_start_end_time_string() { #[test] fn after_queue_start_end_timestamp() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608302400") @@ -47,7 +48,7 @@ fn after_queue_start_end_timestamp() { #[test] fn after_queue_qid() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608302400") @@ -70,7 +71,7 @@ fn after_queue_qid() { #[test] fn after_queue_host() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608302400") @@ -93,7 +94,7 @@ fn after_queue_host() { #[test] fn after_queue_search_string() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608302400") diff --git a/tests/tests_before_queue.rs b/tests/tests_before_queue.rs index b49f5cb..2c3ef8d 100644 --- a/tests/tests_before_queue.rs +++ b/tests/tests_before_queue.rs @@ -5,7 +5,7 @@ mod utils; #[test] fn before_queue_start_end_time_string() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("2020-12-18 15:00:00") @@ -26,7 +26,7 @@ fn before_queue_start_end_time_string() { #[test] fn before_queue_start_end_timestamp() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608300000") @@ -47,7 +47,7 @@ fn before_queue_start_end_timestamp() { #[test] fn before_queue_qid() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608300000") @@ -70,7 +70,7 @@ fn before_queue_qid() { #[test] fn before_queue_host() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608300000") @@ -93,7 +93,7 @@ fn before_queue_host() { #[test] fn before_queue_search_string() { - let output = Command::new("./target/debug/pmg-log-tracker") + let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") .arg("1608300000") diff --git a/tests/utils.rs b/tests/utils.rs index 70b89ac..1d14c88 100644 --- a/tests/utils.rs +++ b/tests/utils.rs @@ -1,5 +1,22 @@ use std::io::BufRead; +use std::env; +use std::path::PathBuf; + +fn get_target_dir() -> PathBuf { + let bin = env::current_exe().expect("exe path"); + let mut target_dir = PathBuf::from(bin.parent().expect("bin parent")); + target_dir.pop(); + target_dir +} + +pub fn log_tracker_path() -> String { + let mut target_dir = get_target_dir(); + target_dir.push("pmg-log-tracker"); + target_dir.to_str().unwrap().to_string() +} + + pub fn compare_output(command: R, expected: R2) { let expected_lines: Vec = expected.lines().map(|l| l.unwrap()).collect(); let command_lines: Vec = command.lines().map(|l| l.unwrap()).collect();