Skip to content

Commit 1a22d65

Browse files
committed
Fixes test
1 parent 970d036 commit 1a22d65

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

frankenphp.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ int frankenphp_update_server_context(bool is_worker_request,
6161
int frankenphp_request_startup();
6262
int frankenphp_execute_script(char *file_name);
6363

64-
int frankenphp_execute_script_cli(char *script, int argc, char **argv, bool eval);
64+
int frankenphp_execute_script_cli(char *script, int argc, char **argv,
65+
bool eval);
6566

6667
void frankenphp_register_variables_from_request_info(
6768
zval *track_vars_array, zend_string *content_type,

frankenphp_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -791,11 +791,16 @@ func TestExecuteScriptCLI(t *testing.T) {
791791
}
792792

793793
func TestExecuteCLICode(t *testing.T) {
794-
var exitCode int
794+
if _, err := os.Stat("internal/testcli/testcli"); err != nil {
795+
t.Skip("internal/testcli/testcli has not been compiled, run `cd internal/testcli/ && go build`")
796+
}
795797

796-
exitCode = frankenphp.ExecutePHPCode("exit(123);")
798+
cmd := exec.Command("internal/testcli/testcli", "-r", "echo 'Hello World';")
799+
stdoutStderr, err := cmd.CombinedOutput()
800+
assert.NoError(t, err)
797801

798-
assert.Equal(t, 123, exitCode)
802+
stdoutStderrStr := string(stdoutStderr)
803+
assert.Equal(t, stdoutStderrStr, `Hello World`)
799804
}
800805

801806
func ExampleServeHTTP() {

internal/testcli/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,9 @@ func main() {
1313
os.Exit(1)
1414
}
1515

16+
if len(os.Args) == 3 && os.Args[1] == "-r" {
17+
os.Exit(frankenphp.ExecutePHPCode(os.Args[2]))
18+
}
19+
1620
os.Exit(frankenphp.ExecuteScriptCLI(os.Args[1], os.Args))
1721
}

0 commit comments

Comments
 (0)