JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: merge conflict
All checks were successful
build / build (push) Successful in 1m24s
Details

Browse Source
This commit is contained in:
李衍志523370910113 2025-05-21 22:37:50 +08:00
commit 2c3944ea3f
9 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
joj3_config_generator/models/result.py
View File

@ -44,7 +44,7 @@ InputFile = Union[LocalFile, MemoryFile, PreparedFile, Symlink]
class Cmd(BaseModel): class Cmd(BaseModel):
args: List[str] = [] args: List[str] = []
env: List[str] = [] env: List[str] = ["PATH=/usr/bin:/bin:/usr/local/bin"]
stdin: Union[InputFile, StreamIn] = MemoryFile(content="") stdin: Union[InputFile, StreamIn] = MemoryFile(content="")
stdout: Union[Collector, StreamOut] = Collector(name="stdout") stdout: Union[Collector, StreamOut] = Collector(name="stdout")
stderr: Union[Collector, StreamOut] = Collector(name="stderr") stderr: Union[Collector, StreamOut] = Collector(name="stderr")

1
joj3_config_generator/transformers/task.py
View File

@ -222,7 +222,6 @@ def fix_diff(
] ]
) )
parser_cases.append(parser_case) parser_cases.append(parser_case)
for case in default_cases: for case in default_cases:
cmd = result.OptionalCmd( cmd = result.OptionalCmd(
stdin=result.LocalFile(src=str(base_dir / f"{case}.in")) stdin=result.LocalFile(src=str(base_dir / f"{case}.in"))

28
tests/convert/basic/task.json
View File

@ -18,7 +18,9 @@
"with": { "with": {
"default": { "default": {
"args": [], "args": [],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },
@ -108,7 +110,9 @@
"args": [ "args": [
"./tools/compile" "./tools/compile"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },
@ -195,7 +199,9 @@
"*.cpp", "*.cpp",
"*.h" "*.h"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },
@ -295,7 +301,9 @@
"h7/build", "h7/build",
"h7/ex2.cpp" "h7/ex2.cpp"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },
@ -421,7 +429,9 @@
"--quiet", "--quiet",
"h7/ex2.cpp" "h7/ex2.cpp"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },
@ -566,7 +576,9 @@
"--exclude=build", "--exclude=build",
"h7/ex2.cpp" "h7/ex2.cpp"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },
@ -663,7 +675,9 @@
"./h7/build/ex2-asan", "./h7/build/ex2-asan",
"-a" "-a"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },

4
tests/convert/clang-tidy/task.json
View File

@ -26,7 +26,9 @@
"h7/build", "h7/build",
"h7/ex2.cpp" "h7/ex2.cpp"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },

4
tests/convert/cppcheck/task.json
View File

@ -26,7 +26,9 @@
"--quiet", "--quiet",
"h7/ex2.cpp" "h7/ex2.cpp"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },

4
tests/convert/cpplint/task.json
View File

@ -25,7 +25,9 @@
"--exclude=build", "--exclude=build",
"h7/ex2.cpp" "h7/ex2.cpp"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },

4
tests/convert/diff/task.json
View File

@ -21,7 +21,9 @@
"./h7/build/ex2-asan", "./h7/build/ex2-asan",
"-a" "-a"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },

4
tests/convert/keyword/task.json
View File

@ -24,7 +24,9 @@
"*.cpp", "*.cpp",
"*.h" "*.h"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },

4
tests/convert/result-detail/task.json
View File

@ -24,7 +24,9 @@
"*.cpp", "*.cpp",
"*.h" "*.h"
], ],
"env": [], "env": [
"PATH=/usr/bin:/bin:/usr/local/bin"
],
"stdin": { "stdin": {
"content": "" "content": ""
}, },