happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests : fix test-jinja-py Windows failures by bypassing command-line args [no ci] (#20483) 

* Fix errors occurring on Windows

* Reverted fix

#20365 will take care of CRLF isue

* Changed to write to directly to stdin

* Prevent fclose to happen twice
This commit is contained in:
Masato Nakasaka 2026-03-18 02:43:31 -07:00 committed by GitHub
parent 5e8910a0db
commit f4049ad735
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/test-jinja.cpp
View File

@ -1897,8 +1897,9 @@ import sys
from datetime import datetime from datetime import datetime
from jinja2.sandbox import SandboxedEnvironment from jinja2.sandbox import SandboxedEnvironment
tmpl = json.loads(sys.argv[1]) merged_input = json.loads(sys.stdin.buffer.read().decode("utf-8"))
vars_json = json.loads(sys.argv[2]) tmpl = merged_input["tmpl"]
vars_json = merged_input["vars"]
env = SandboxedEnvironment( env = SandboxedEnvironment(
trim_blocks=True, trim_blocks=True,
@ -1921,8 +1922,9 @@ sys.stdout.buffer.write(result.encode())
static void test_template_py(testing & t, const std::string & name, const std::string & tmpl, const json & vars, const std::string & expect) { static void test_template_py(testing & t, const std::string & name, const std::string & tmpl, const json & vars, const std::string & expect) {
t.test(name, [&tmpl, &vars, &expect](testing & t) { t.test(name, [&tmpl, &vars, &expect](testing & t) {
// Prepare arguments // Prepare arguments
std::string tmpl_json = json(tmpl).dump(); json merged;
std::string vars_json = vars.dump(); merged["tmpl"] = json(tmpl);
merged["vars"] = vars;
#ifdef _WIN32 #ifdef _WIN32
const char * python_executable = "python.exe"; const char * python_executable = "python.exe";
@ -1930,7 +1932,7 @@ static void test_template_py(testing & t, const std::string & name, const std::s
const char * python_executable = "python3"; const char * python_executable = "python3";
#endif #endif
const char * command_line[] = {python_executable, "-c", py_script.c_str(), tmpl_json.c_str(), vars_json.c_str(), NULL}; const char * command_line[] = {python_executable, "-c", py_script.c_str(), NULL};
struct subprocess_s subprocess; struct subprocess_s subprocess;
int options = subprocess_option_combined_stdout_stderr int options = subprocess_option_combined_stdout_stderr
@ -1944,6 +1946,20 @@ static void test_template_py(testing & t, const std::string & name, const std::s
t.assert_true("subprocess creation", false); t.assert_true("subprocess creation", false);
return; return;
} }
FILE * p_stdin = subprocess_stdin(&subprocess);
// Write input
std::string input = merged.dump();
auto written = fwrite(input.c_str(), 1, input.size(), p_stdin);
if (written != input.size()) {
t.log("Failed to write complete input to subprocess stdin");
t.assert_true("subprocess stdin write", false);
subprocess_destroy(&subprocess);
return;
}
fflush(p_stdin);
fclose(p_stdin); // Close stdin to signal EOF to the Python process
subprocess.stdin_file = nullptr;
// Read output // Read output
std::string output; std::string output;