[Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0

[Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0

[Sergey Kaplun via Tarantool-patches]

When building <tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c> on
macOS Sequoia 15.0, I've got the following error from including
<sys/ptrace.h>:

| error: unknown type name 'caddr_t'
| int     ptrace(int _request, pid_t _pid, caddr_t _addr, int _data);

It can be fixed by including <sys/types.h>, but since this test is
skipped for macOS anyway, I prefer just to move all necessary includes
under the corresponding define.
---

Branch: https://github.com/tarantool/luajit/tree/skaplun/gh-noticket-fix-macos-c-tests

 .../gh-8594-sysprof-ffunc-crash.test.c               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
index cf1d815a..4067ba1d 100644
--- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
+++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
@@ -5,12 +5,6 @@
 #include "test.h"
 #include "utils.h"
 
-#include <signal.h>
-#include <sys/ptrace.h>
-#include <sys/user.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
 /* XXX: Still need normal assert inside <tracee> and helpers. */
 #undef NDEBUG
 #include <assert.h>
@@ -24,6 +18,12 @@
 
 #if LUAJIT_OS == LUAJIT_OS_LINUX && LUAJIT_TARGET == LUAJIT_ARCH_X64
 
+#include <signal.h>
+#include <sys/ptrace.h>
+#include <sys/user.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
 /*
  * XXX: The test makes sysprof collect the particular event
  * (FFUNC) at the particular instruction (<lj_fff_res1>) to
-- 
2.47.0

Re: [Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0

[Sergey Bronnikov via Tarantool-patches]

[-- Attachment #1: Type: text/plain, Size: 1735 bytes --]

Hi, Sergey

thanks for the fix, LGTM

Sergey

On 29.10.2024 11:42, Sergey Kaplun wrote:
> When building <tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c> on
> macOS Sequoia 15.0, I've got the following error from including
> <sys/ptrace.h>:
>
> | error: unknown type name 'caddr_t'
> | int     ptrace(int _request, pid_t _pid, caddr_t _addr, int _data);
>
> It can be fixed by including <sys/types.h>, but since this test is
> skipped for macOS anyway, I prefer just to move all necessary includes
> under the corresponding define.
> ---
>
> Branch:https://github.com/tarantool/luajit/tree/skaplun/gh-noticket-fix-macos-c-tests
>
>   .../gh-8594-sysprof-ffunc-crash.test.c               | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
> index cf1d815a..4067ba1d 100644
> --- a/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
> +++ b/test/tarantool-c-tests/gh-8594-sysprof-ffunc-crash.test.c
> @@ -5,12 +5,6 @@
>   #include "test.h"
>   #include "utils.h"
>   
> -#include <signal.h>
> -#include <sys/ptrace.h>
> -#include <sys/user.h>
> -#include <sys/wait.h>
> -#include <unistd.h>
> -
>   /* XXX: Still need normal assert inside <tracee> and helpers. */
>   #undef NDEBUG
>   #include <assert.h>
> @@ -24,6 +18,12 @@
>   
>   #if LUAJIT_OS == LUAJIT_OS_LINUX && LUAJIT_TARGET == LUAJIT_ARCH_X64
>   
> +#include <signal.h>
> +#include <sys/ptrace.h>
> +#include <sys/user.h>
> +#include <sys/wait.h>
> +#include <unistd.h>
> +
>   /*
>    * XXX: The test makes sysprof collect the particular event
>    * (FFUNC) at the particular instruction (<lj_fff_res1>) to

[-- Attachment #2: Type: text/html, Size: 2337 bytes --]

Re: [Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0

[Maxim Kokryashkin via Tarantool-patches]

Hi, Sergey!
Thanks for the patch!
LGTM

Re: [Tarantool-patches] [PATCH luajit] test: fix build for macOS Sequoia 15.0

[Sergey Kaplun via Tarantool-patches]

I've applied the patch into all long-term branches in tarantool/luajit
and bumped a new version in master [1], release/3.3 [2], release/3.2 [3]
and release/2.11 [4].

[1]: https://github.com/tarantool/tarantool/pull/10936
[2]: https://github.com/tarantool/tarantool/pull/10937
[3]: https://github.com/tarantool/tarantool/pull/10938
[4]: https://github.com/tarantool/tarantool/pull/10939

-- 
Best regards,
Sergey Kaplun