From 40d8639a26eeba06c6ca2ef161fefed163e907b7 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Fri, 10 Dec 2021 22:54:05 +0100 Subject: [PATCH] Take config file as parameter in test binaries --- card-functionality/src/import.rs | 7 ++++++- card-functionality/src/keygen.rs | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/card-functionality/src/import.rs b/card-functionality/src/import.rs index 9c6e5fc..e0e3893 100644 --- a/card-functionality/src/import.rs +++ b/card-functionality/src/import.rs @@ -13,7 +13,12 @@ use card_functionality::util; fn main() -> Result<()> { env_logger::init(); - let config = TestConfig::load("config/test-cards.toml")?; + let args: Vec = std::env::args().collect(); + let config = if args.len() <= 1 { + TestConfig::load("config/test-cards.toml")? + } else { + TestConfig::load(&args[1])? + }; let cards = config.into_cardapps(); diff --git a/card-functionality/src/keygen.rs b/card-functionality/src/keygen.rs index fb888b5..45976b0 100644 --- a/card-functionality/src/keygen.rs +++ b/card-functionality/src/keygen.rs @@ -12,7 +12,12 @@ use sequoia_openpgp::Cert; fn main() -> Result<()> { env_logger::init(); - let config = TestConfig::load("config/test-cards.toml")?; + let args: Vec = std::env::args().collect(); + let config = if args.len() <= 1 { + TestConfig::load("config/test-cards.toml")? + } else { + TestConfig::load(&args[1])? + }; let cards = config.into_cardapps();