Merge #9

9: Allow overriding valuer cwd r=MikailBag a=MikailBag Co-authored-by: Mikail Bagishov <[email protected]>
jjs-dev · May 15, 2021 · f2eebed · f2eebed
2 parents 3ec95ed + 1dd2855
commit f2eebed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/engine/src/apis/compile/builder.rs b/engine/src/apis/compile/builder.rs
@@ -457,11 +457,10 @@ impl<'a> ProblemBuilder<'a> {
         let valuer = pom::ChildValuer {
             exe: valuer_exe,
             extra_args: Vec::new(),
-        };
-
-        let valuer_config = FileRef {
-            root: FileRefRoot::Problem,
-            path: "valuer-cfg".to_string(),
+            current_dir: Some(FileRef {
+                root: FileRefRoot::Problem,
+                path: "valuer-cfg".to_string(),
+            }),
         };
 
         let problem = pom::Problem {
@@ -471,7 +470,6 @@ impl<'a> ProblemBuilder<'a> {
             checker_cmd,
             valuer: pom::Valuer::Child(valuer),
             tests,
-            valuer_config,
         };
         let manifest_path = format!("{}/manifest.json", self.out_dir.display());
         let manifest_data =

diff --git a/pom/src/lib.rs b/pom/src/lib.rs
@@ -134,6 +134,8 @@ pub enum Valuer {
 pub struct ChildValuer {
     /// Valuer binary
     pub exe: FileRef,
+    /// Current directory. Default is problem assets directory
+    pub current_dir: Option<FileRef>,
     /// Extra arguments to pass to valuer
     #[serde(default)]
     pub extra_args: Vec<String>,
@@ -148,5 +150,4 @@ pub struct Problem {
     pub checker_exe: FileRef,
     pub checker_cmd: Vec<String>,
     pub valuer: Valuer,
-    pub valuer_config: FileRef,
 }
diff --git a/valuer-api/src/lib.rs b/valuer-api/src/lib.rs
@@ -174,6 +174,7 @@ impl Default for JudgeLog {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProblemInfo {
     pub tests: Vec<String>,
+    // TODO: valuer config
 }
 
 #[derive(Debug, Serialize, Deserialize, Eq, PartialEq)]