Move ./examples/tests.ron to ./test-with-generated-opts.toml

qryxip · qryxip · commit e3394e27a3db · 2019-12-20T20:04:57.000+09:00
diff --git a/examples/tests.ron b/examples/tests.ron
diff --git a/test-with-generated-opts.toml b/test-with-generated-opts.toml
@@ -0,0 +1,70 @@
+# 手元でDropboxのテストケース（ある場合）で確認し、サンプルに含まれていないやつが大きいときはそれらをGitに入れない。
+# その場合CI上でもサンプルだけテストする。（Dropboxから引っ張るのも面倒だし何より誰のアカウントを使うかという問題がある）
+
+[tests.abc054-c]
+matching = "Words"
+name = "ABC054: C - One-stroke Path"
+
+[tests.abc057-b]
+matching = "Words"
+name = "ABC057: B - Checkpoints"
+
+[tests.abc084-d]
+matching = "Words"
+name = "ABC084: D - 2017-like Number"
+
+[tests.abc118-b]
+matching = "Words"
+name = "ABC118: B - Foods Loved by Everyone"
+
+[tests.abc120-d]
+matching = "Words"
+name = "ABC120: D - Decayed Bridges"
+
+[tests.abc121-b]
+matching = "Words"
+name = "ABC121: B - Can you solve this?"
+
+[tests.abc129-f]
+matching = "Words"
+name = "ABC129: F - Takahashi's Basics in Education and Learning"
+
+[tests.abc142-d]
+matching = "Words"
+name = "ABC142: D - Disjoint Set of Common Divisors"
+
+[tests.abc144-d]
+name = "ABC144: D - Water Bottle"
+matching = { FloatOr = { abs = 1e-6, rel = 1e-6 }}
+
+[tests.apg4b-a]
+matching = "Exact"
+name = "APG4b: A - 1.00.はじめに"
+
+[tests.apg4b-ex25]
+matching = "Words"
+name = "APG4b: EX25 - 集合の操作 / 3.05"
+
+[tests.apg4b-ex26]
+matching = "Exact"
+name = "APG4b: EX26 - 電卓を作ろう3 / 3.06"
+
+[tests.arc065-c]
+matching = "Words"
+name = "ABC049 / ARC065: C - 白昼夢 / Daydream"
+
+[tests.arc084-c]
+matching = "Words"
+name = "ABC077 / ARC084: C - Snuke Festival"
+
+[tests.atc001-b]
+matching = "Words"
+name = "ATC001: B - Union Find"
+
+[tests.atc002-b]
+matching = "Words"
+name = "ATC002: B - n^p mod m"
+
+[tests.practice-a]
+matching = "Words"
+name = "practice contest: A - Welcome to AtCoder"
diff --git a/tools/test-with-generated-opts/Cargo.toml b/tools/test-with-generated-opts/Cargo.toml
@@ -12,10 +12,10 @@ env_logger = "0.7.1"
 indexmap = { version = "1.3.0", features = ["serde-1"] }
 itertools = "0.8.2"
 log = "0.4.8"
-ron = "0.5.1"
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0.44"
 shell-escape = "0.1.4"
 structopt = "0.3.5"
 tempdir = "0.3.7"
+toml = "0.5.5"
 which = { version = "3.1.0", default-features = false }
diff --git a/tools/test-with-generated-opts/src/main.rs b/tools/test-with-generated-opts/src/main.rs
@@ -9,20 +9,26 @@ use structopt::StructOpt;
 use tempdir::TempDir;
 
 use std::collections::{BTreeMap, HashMap};
-use std::env;
-use std::f64;
 use std::ffi::{OsStr, OsString};
-use std::fs::{self, File};
 use std::io::{self, Read as _, Write as _};
 use std::path::{Path, PathBuf};
 use std::process::{Command, Output, Stdio};
 use std::time::Instant;
+use std::{env, f64, fs};
 
 #[derive(StructOpt, Debug)]
-struct Opt {}
+struct Opt {
+    #[structopt(
+        long,
+        value_name("PATH"),
+        default_value("./test-with-generated-opts.toml"),
+        help("Path to the config")
+    )]
+    config: PathBuf,
+}
 
 fn main() -> anyhow::Result<()> {
-    Opt::from_args();
+    let Opt { config } = Opt::from_args();
 
     env_logger::builder()
         .format(|buf, record| {
@@ -48,10 +54,10 @@ fn main() -> anyhow::Result<()> {
         .filter_module("test_with_generated_opts", LevelFilter::Info)
         .init();
 
-    let Tests { tests } = File::open("./examples/tests.ron")
+    let Tests { tests } = fs::read_to_string(&config)
         .map_err(anyhow::Error::from)
-        .and_then(|h| ron::de::from_reader(h).map_err(Into::into))
-        .with_context(|| "Failed to read ./examples/tests.ron")?;
+        .and_then(|s| toml::from_str(&s).map_err(Into::into))
+        .with_context(|| format!("Failed to read {}", config.display()))?;
 
     let tempdir = TempDir::new("atcoder-rust-base-test-with-generated-opts")?;
 
