diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index d4ce5a9..9ba8402 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -496,8 +496,10 @@ } }, { - "name": "clang-tidy", - "with": {} + "name": "clangtidy", + "with": { + "matches": [] + } }, { "name": "result-detail", @@ -570,7 +572,7 @@ }, "stdout": { "name": "stdout", - "max": 65, + "max": 68157440, "pipe": true }, "stderr": { @@ -717,9 +719,9 @@ "stdin": { "src": "/home/tt/.config/joj/basic/case1.in" }, - "cpuLimit": 1234567890, - "clockLimit": 2469135780, - "memoryLimit": 9876543210, + "cpuLimit": 1000000000, + "clockLimit": 2000000000, + "memoryLimit": 5242880, "procLimit": 50 } ] diff --git a/tests/convert/basic/task.toml b/tests/convert/basic/task.toml index a98f6e5..46b8744 100644 --- a/tests/convert/basic/task.toml +++ b/tests/convert/basic/task.toml @@ -53,7 +53,7 @@ name = "[cq] Cppcheck" command = "cppcheck --template='{\"file\":\"{file}\",\"line\":{line}, \"column\":{column}, \"severity\":\"{severity}\", \"message\":\"{message}\", \"id\":\"{id}\"}' --force --enable=all --suppress=missingIncludeSystem --quiet h7/ex2.cpp" limit.stderr = "8m" -parsers = [ "keyword", "cppcheck", "clang-tidy", "result-detail", "cpplint", "result-status", "file", "dummy", "diff" ] +parsers = [ "keyword", "cppcheck", "clangtidy", "result-detail", "cpplint", "result-status", "file", "dummy", "diff" ] cppcheck.keyword = ["error", "warning", "portability", "performance", "style"] cppcheck.weight = [15, 5, 5, 5, 5] result-detail.exitstatus = true @@ -64,7 +64,7 @@ result-detail.mem = false [[stages]] name = "[cq] Cpplint" command = "cpplint --linelength=120 --filter=-legal,-readability/casting,-whitespace,-runtime/printf,-runtime/threadsafe_fn,-runtime/int,-readability/todo,-build/include_subdir,-build/header_guard,-build/include_what_you_use --recursive --exclude=build h7/ex2.cpp" -limit.stdout = 65 +limit.stdout = "65m" parsers = [ "cpplint", "result-detail" ] cpplint.keyword = [ "runtime", "readability", "build" ] @@ -94,8 +94,8 @@ case0.diff.output.ignore_spaces = true case0.in = "case0.in" case1.diff.output.score = 5 -case1.limit.cpu = 1234567890 -case1.limit.mem = 9876543210 +case1.limit.cpu = "1s" +case1.limit.mem = "5m" case1.diff.output.ignore_spaces = true #case1.limit.stdout = 8 #case1.command = "./h7/build/ex2" diff --git a/tests/convert/clang-tidy/task.json b/tests/convert/clang-tidy/task.json index 24a529e..9b848af 100644 --- a/tests/convert/clang-tidy/task.json +++ b/tests/convert/clang-tidy/task.json @@ -32,7 +32,7 @@ }, "stdout": { "name": "stdout", - "max": 65, + "max": 68157440, "pipe": true }, "stderr": { diff --git a/tests/convert/clang-tidy/task.toml b/tests/convert/clang-tidy/task.toml index 3985ed9..cc4f91b 100644 --- a/tests/convert/clang-tidy/task.toml +++ b/tests/convert/clang-tidy/task.toml @@ -9,7 +9,7 @@ release.begin_time = 2024-12-29 23:59:59+08:00 name = "[cq] Clang-tidy" command = "run-clang-tidy-18 -header-filter=.* -quiet -load=/usr/local/lib/libcodequality.so -p h7/build h7/ex2.cpp" files.import = [ "tests/homework/h7/.clang-tidy", "h7/build/compile_commands.json" ] -limit.stdout = 65 +limit.stdout = "65m" parsers = [ "clangtidy", "result-detail" ] clangtidy.keyword = [ "codequality-unchecked-malloc-result", "codequality-no-global-variables", "codequality-no-header-guard", "codequality-no-fflush-stdin", "readability-function-size", "readability-duplicate-include", "readability-identifier-naming", "readability-redundant", "readability-misleading-indentation", "readability-misplaced-array-index", "cppcoreguidelines-init-variables", "bugprone-suspicious-string-compare", "google-global-names-in-headers", "clang-diagnostic", "clang-analyzer", "misc", "performance", "portability" ] diff --git a/tests/convert/cppcheck/task.json b/tests/convert/cppcheck/task.json index 5988add..6d79c22 100644 --- a/tests/convert/cppcheck/task.json +++ b/tests/convert/cppcheck/task.json @@ -37,7 +37,7 @@ }, "stderr": { "name": "stderr", - "max": 65, + "max": 68157440, "pipe": true }, "cpuLimit": 1000000000, diff --git a/tests/convert/cppcheck/task.toml b/tests/convert/cppcheck/task.toml index 5d1f74b..50c8aa7 100644 --- a/tests/convert/cppcheck/task.toml +++ b/tests/convert/cppcheck/task.toml @@ -8,7 +8,7 @@ release.begin_time = 2024-12-29 23:59:59+08:00 [[stages]] name = "[cq] Cppcheck" command = "cppcheck --template='{\"file\":\"{file}\",\"line\":{line}, \"column\":{column}, \"severity\":\"{severity}\", \"message\":\"{message}\", \"id\":\"{id}\"}' --force --enable=all --suppress=missingIncludeSystem --quiet h7/ex2.cpp" -limit.stderr = 65 +limit.stderr = "65m" parsers = [ "cppcheck", "result-detail" ] cppcheck.keyword = ["error", "warning", "portability", "performance", "style"] diff --git a/tests/convert/cpplint/task.json b/tests/convert/cpplint/task.json index bf0a9c6..979e709 100644 --- a/tests/convert/cpplint/task.json +++ b/tests/convert/cpplint/task.json @@ -31,7 +31,7 @@ }, "stdout": { "name": "stdout", - "max": 65, + "max": 68157440, "pipe": true }, "stderr": { diff --git a/tests/convert/cpplint/task.toml b/tests/convert/cpplint/task.toml index 2e04eb5..018413d 100644 --- a/tests/convert/cpplint/task.toml +++ b/tests/convert/cpplint/task.toml @@ -8,7 +8,7 @@ release.begin_time = 2024-12-29 23:59:59+08:00 [[stages]] name = "[cq] Cpplint" command = "cpplint --linelength=120 --filter=-legal,-readability/casting,-whitespace,-runtime/printf,-runtime/threadsafe_fn,-runtime/int,-readability/todo,-build/include_subdir,-build/header_guard,-build/include_what_you_use --recursive --exclude=build h7/ex2.cpp" -limit.stdout = 65 +limit.stdout = "65m" parsers = [ "cpplint", "result-detail" ] cpplint.keyword = [ "runtime", "readability", "build" ] diff --git a/tests/convert/diff/task.json b/tests/convert/diff/task.json index c1aa514..9636feb 100644 --- a/tests/convert/diff/task.json +++ b/tests/convert/diff/task.json @@ -37,7 +37,7 @@ }, "cpuLimit": 1000000000, "clockLimit": 2000000000, - "memoryLimit": 91224961, + "memoryLimit": 68157440, "stackLimit": 0, "procLimit": 50, "cpuRateLimit": 0, diff --git a/tests/convert/diff/task.toml b/tests/convert/diff/task.toml index ff607dc..bfd4f76 100644 --- a/tests/convert/diff/task.toml +++ b/tests/convert/diff/task.toml @@ -9,7 +9,7 @@ release.begin_time = 2024-12-29 23:59:59+08:00 name = "[joj] ex2-asan" command="./h7/build/ex2-asan -a" files.import = [ "h7/build/ex2-asan" ] -limit.mem = 91224961 +limit.mem = "65m" parsers = [ "diff", "result-detail" ] result-detail.exitstatus = true