Changed to use compile_command in the toml file when test and submit (#246)

shibukazu · web-flow · commit 3ca7a4983ac5 · 2021-11-29T08:57:09.000+09:00
* fix function to specify compile_command on option file

* Fix for style violations
diff --git a/atcodertools/config/config.py b/atcodertools/config/config.py
@@ -44,6 +44,13 @@ def get_config_dic(config_dic, config_type: ConfigType, lang=None):
         else:
             result[k] = v
     result = _update_config_dict(result, lang_dic)
+
+    if config_type == ConfigType.TESTER:
+        compiler_dic = config_dic.get("compiler", {})
+        compile_command = compiler_dic.get("compile_command", None)
+        result = _update_config_dict(
+            result, {"compile_command": compile_command})
+
     return result
 
 
diff --git a/atcodertools/tools/tester.py b/atcodertools/tools/tester.py
@@ -390,7 +390,10 @@ def main(prog, args) -> bool:
     elif config.tester_config.compile_before_testing:
         # Use atcoder-tools's functionality to compile source code
         force_compile = not config.tester_config.compile_only_when_diff_detected
-        compile_command = config.tester_config.compile_command
+        if args.compile_command:
+            compile_command = args.compile_command
+        else:
+            compile_command = config.tester_config.compile_command
         if compile_command:
             compile_command = lang.get_compile_command("main", compile_command)
         try:
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_1.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_1.txt
@@ -0,0 +1 @@
+50 100 120
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_2.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_2.txt
@@ -0,0 +1 @@
+500 100 1000
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_3.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_3.txt
@@ -0,0 +1 @@
+19 123 143
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_4.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/in_4.txt
@@ -0,0 +1 @@
+19 123 142
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/main.cpp b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/main.cpp
@@ -0,0 +1,11 @@
+#include <bits/stdc++.h>
+
+using namespace std;
+
+int main(){
+	int A, B, C;
+	cin>>A>>B>>C;
+	if(A + B >= C)cout<<"Yes"<<endl;
+	else cout<<"No"<<endl;
+}
+
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/metadata.json b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/metadata.json
@@ -0,0 +1,16 @@
+{
+ "code_filename": "main.cpp",
+ "judge": {
+  "judge_type": "normal"
+ },
+ "lang": "cpp",
+ "problem": {
+  "alphabet": "A",
+  "contest": {
+   "contest_id": "abc091"
+  },
+  "problem_id": "abc091_a"
+ },
+ "sample_in_pattern": "in_*.txt",
+ "sample_out_pattern": "out_*.txt"
+}
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_1.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_1.txt
@@ -0,0 +1 @@
+Yes
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_2.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_2.txt
@@ -0,0 +1 @@
+No
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_3.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_3.txt
@@ -0,0 +1 @@
+No
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_4.txt b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/out_4.txt
@@ -0,0 +1 @@
+Yes
diff --git a/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/tester_options.toml b/tests/resources/test_tester/test_compiler_when_compiler_command_is_specified_in_option_file/tester_options.toml
@@ -0,0 +1,5 @@
+[codestyle]
+indent_width = 8
+[compiler]
+compile_command='g++ main.cpp -o main -std=c++17'
+compile_only_when_diff_detected=true
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -139,6 +139,13 @@ def test_load_config_compiler(self):
         self.assertEqual('g++ main.cpp -o main -std=c++17',
                          config.compiler_config.compile_command)
 
+        # check that config.tester_config has compile_command
+        with open(os.path.join(RESOURCE_DIR, "compiler_options.toml"), 'r') as f:
+            config = Config.load(
+                f, {ConfigType.TESTER})
+            self.assertEqual('g++ main.cpp -o main -std=c++17',
+                             config.tester_config.compile_command)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_tester.py b/tests/test_tester.py
@@ -2,6 +2,8 @@
 import unittest
 import shutil
 import tempfile
+import io
+import sys
 
 from colorama import Fore
 from unittest.mock import patch, mock_open, MagicMock
@@ -260,6 +262,23 @@ def test_compiler_and_tester_for_each_lang(self):
                 self.assertTrue(tester.main(
                     '', ['-d', lang_dir, "-n", "{:d}".format(i), "--compile-before-testing", "-j", "normal"]))
 
+    def test_compiler_when_compiler_command_is_specified_in_option_file(self):
+        test_dir = os.path.join(self.temp_dir, "test")
+        shutil.copytree(os.path.join(
+            RESOURCE_DIR, "test_compiler_when_compiler_command_is_specified_in_option_file"), test_dir)
+        config_path = os.path.join(
+            RESOURCE_DIR, "test_compiler_when_compiler_command_is_specified_in_option_file", "tester_options.toml")
+        f = io.StringIO()
+        sys.stdout = f
+        self.assertTrue(tester.main(
+            '', ['-d', test_dir, "--compile-before-testing",
+                 "-j", "normal",
+                 "--config", config_path]))
+        sys.stdout = sys.__stdout__
+        stdouts = f.getvalue().split("\n")
+        self.assertTrue(
+            True if "compile command:  g++ main.cpp -o main -std=c++17" in stdouts else False)
+
 
 if __name__ == '__main__':
     unittest.main()
