From 0fb38edcb67cc067efc7945318bd322760bc9b54 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Mon, 16 Oct 2023 10:11:51 +0300 Subject: [PATCH] ci: fix vcreate_input_test.v on FreeBSD (expect is in /usr/local/bin there, if installed) (#19578) --- cmd/tools/vcreate/tests/new_with_model_arg.expect | 2 +- cmd/tools/vcreate/tests/new_with_name_arg.expect | 2 +- cmd/tools/vcreate/tests/new_with_no_arg.expect | 2 +- cmd/tools/vcreate/vcreate_input_test.v | 15 ++++++++++++--- examples/password/tests/correct.expect | 2 +- examples/password/tests/incorrect.expect | 2 +- .../password/tests/output_from_expect_arg.expect | 2 +- examples/readline/tests/readline.expect | 2 +- .../tests/readline_from_expect_arg.expect | 2 +- 9 files changed, 20 insertions(+), 11 deletions(-) diff --git a/cmd/tools/vcreate/tests/new_with_model_arg.expect b/cmd/tools/vcreate/tests/new_with_model_arg.expect index a96302483..96d1280ae 100755 --- a/cmd/tools/vcreate/tests/new_with_model_arg.expect +++ b/cmd/tools/vcreate/tests/new_with_model_arg.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 diff --git a/cmd/tools/vcreate/tests/new_with_name_arg.expect b/cmd/tools/vcreate/tests/new_with_name_arg.expect index 8c3d23857..f033f04a4 100755 --- a/cmd/tools/vcreate/tests/new_with_name_arg.expect +++ b/cmd/tools/vcreate/tests/new_with_name_arg.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 diff --git a/cmd/tools/vcreate/tests/new_with_no_arg.expect b/cmd/tools/vcreate/tests/new_with_no_arg.expect index 485d33d37..c975229de 100755 --- a/cmd/tools/vcreate/tests/new_with_no_arg.expect +++ b/cmd/tools/vcreate/tests/new_with_no_arg.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 diff --git a/cmd/tools/vcreate/vcreate_input_test.v b/cmd/tools/vcreate/vcreate_input_test.v index e4309eb74..5be6fc3f6 100644 --- a/cmd/tools/vcreate/vcreate_input_test.v +++ b/cmd/tools/vcreate/vcreate_input_test.v @@ -16,6 +16,12 @@ const ( expect_tests_path = os.join_path(@VMODROOT, 'cmd', 'tools', 'vcreate', 'tests') ) +fn testsuite_begin() { + dump(expect_exe) + dump(test_module_path) + dump(expect_tests_path) +} + fn prepare_test_path() ! { os.rmdir_all(test_module_path) or {} os.mkdir_all(test_module_path) or {} @@ -25,7 +31,8 @@ fn prepare_test_path() ! { fn test_new_with_no_arg_input() { prepare_test_path()! project_name := 'my_project' - res := os.execute('${os.join_path(expect_tests_path, 'new_with_no_arg.expect')} ${@VMODROOT} ${project_name}') + res := os.execute('${os.quoted_path(expect_exe)} ${os.join_path(expect_tests_path, + 'new_with_no_arg.expect')} ${@VMODROOT} ${project_name}') if res.exit_code != 0 { assert false, res.output } @@ -46,7 +53,8 @@ fn test_new_with_no_arg_input() { fn test_new_with_name_arg_input() { prepare_test_path()! project_name := 'my_other_project' - res := os.execute('${os.join_path(expect_tests_path, 'new_with_name_arg.expect')} ${@VMODROOT} ${project_name}') + res := os.execute('${os.quoted_path(expect_exe)} ${os.join_path(expect_tests_path, + 'new_with_name_arg.expect')} ${@VMODROOT} ${project_name}') if res.exit_code != 0 { assert false, res.output } @@ -68,7 +76,8 @@ fn test_new_with_model_arg_input() { prepare_test_path()! project_name := 'my_lib' model := 'lib' - res := os.execute('${os.join_path(expect_tests_path, 'new_with_model_arg.expect')} ${@VMODROOT} ${project_name} ${model}') + res := os.execute('${os.quoted_path(expect_exe)} ${os.join_path(expect_tests_path, + 'new_with_model_arg.expect')} ${@VMODROOT} ${project_name} ${model}') if res.exit_code != 0 { assert false, res.output } diff --git a/examples/password/tests/correct.expect b/examples/password/tests/correct.expect index 81139bc32..c422192b4 100755 --- a/examples/password/tests/correct.expect +++ b/examples/password/tests/correct.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 set v_root [exec sh -c "git rev-parse --show-toplevel"] diff --git a/examples/password/tests/incorrect.expect b/examples/password/tests/incorrect.expect index 3d95feaa7..e1412c7b3 100755 --- a/examples/password/tests/incorrect.expect +++ b/examples/password/tests/incorrect.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 set v_root [exec sh -c "git rev-parse --show-toplevel"] diff --git a/examples/password/tests/output_from_expect_arg.expect b/examples/password/tests/output_from_expect_arg.expect index 12ae1650b..398d5afec 100755 --- a/examples/password/tests/output_from_expect_arg.expect +++ b/examples/password/tests/output_from_expect_arg.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 set v_root [exec sh -c "git rev-parse --show-toplevel"] diff --git a/examples/readline/tests/readline.expect b/examples/readline/tests/readline.expect index 564c8645e..905c9ab5a 100755 --- a/examples/readline/tests/readline.expect +++ b/examples/readline/tests/readline.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 set v_root [exec sh -c "git rev-parse --show-toplevel"] diff --git a/examples/readline/tests/readline_from_expect_arg.expect b/examples/readline/tests/readline_from_expect_arg.expect index 7b478fc81..b558f62fc 100755 --- a/examples/readline/tests/readline_from_expect_arg.expect +++ b/examples/readline/tests/readline_from_expect_arg.expect @@ -1,4 +1,4 @@ -#!/usr/bin/expect +#!/usr/bin/env expect set timeout 3 set v_root [exec sh -c "git rev-parse --show-toplevel"] -- 2.39.5