test

Author: andarut

.github/workflows/Dockerfile.buster

@@ -18,6 +18,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       git cmake-data=3.18* cmake=3.18* make g++ gperf netcat \
       python3-minimal python3-dev libpython3-dev python3-jsonschema python3-setuptools python3-pip && \
+    git clone https://github.com/kaniini/libucontext && cd libucontext && make FREESTANDING=yes ARCH=x86_64 && cp -R include/libucontext /usr/local/include && cp libucontext.a /usr/local/lib && cd .. && \
     pip3 install wheel && \
     apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
       libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev mysql-server libmysqlclient-dev libldap-dev libkrb5-dev \

.github/workflows/Dockerfile.focal

@@ -11,14 +11,15 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       git cmake make clang g++ g++-10 gperf netcat \
       python3-minimal python3-dev libpython3-dev python3-jsonschema python3-setuptools python3-pip && \
+    git clone https://github.com/kaniini/libucontext && cd libucontext && make FREESTANDING=yes ARCH=x86_64 && cp -R include/libucontext /usr/local/include && cp libucontext.a /usr/local/lib && cd .. && \
     pip3 install wheel && \
     apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
       libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev mysql-server libmysqlclient-dev libldap-dev libkrb5-dev \
       postgresql postgresql-server-dev-all libnuma-dev composer unzip && \
     pip3 install portalocker psutil requests-toolbelt pytest pytest-xdist pytest-mysql pytest-postgresql psycopg zstandard && \
     rm -rf /var/lib/apt/lists/*
 
-ENV ASAN_OPTIONS=detect_leaks=0
+ENV ASAN_OPTIONS=detect_leaks=1
 ENV UBSAN_OPTIONS=print_stacktrace=1:allow_addr2line=1
 
 RUN useradd -ms /bin/bash kitten

.github/workflows/Dockerfile.jammy

@@ -13,6 +13,7 @@ RUN apt update && \
     apt install -y --no-install-recommends \
       git cmake make g++ lld gperf netcat \
       python3-minimal python3-dev libpython3-dev python3-jsonschema python3-setuptools python3-pip && \
+    git clone https://github.com/kaniini/libucontext && cd libucontext && make ARCH=x86_64 && make FREESTANDING=yes ARCH=x86_64 && cp -R include/libucontext /usr/local/include && cp libucontext.a /usr/local/lib && cd .. && \
     pip3 install wheel && \
     apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
       libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev mysql-server libmysqlclient-dev libnuma-dev unzip \
@@ -32,7 +33,7 @@ RUN update-alternatives --install /usr/bin/ld ld /usr/bin/x86_64-linux-gnu-ld 10
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
     php composer-setup.php --install-dir=/usr/bin --filename=composer --version=1.10.26
 
-ENV ASAN_OPTIONS=detect_leaks=0
+ENV ASAN_OPTIONS=detect_leaks=1
 ENV UBSAN_OPTIONS=print_stacktrace=1:allow_addr2line=1
 
 RUN useradd -ms /bin/bash kitten

cmake/init-compilation-flags.cmake

@@ -27,6 +27,10 @@ if(APPLE)
     else()
         message(FATAL_ERROR "unsupported arch: ${CMAKE_SYSTEM_PROCESSOR}")
     endif()
+else()
+    add_compile_options(-l:ucontext)
+    link_directories(/usr/local/lib)
+    add_compile_options(-Wno-unused-command-line-argument)
 endif()
 
 set(OPENSSL_USE_STATIC_LIBS TRUE)

compiler/compiler-settings.cpp

@@ -320,7 +320,9 @@ void CompilerSettings::init() {
   ld_flags.value_ = extra_ld_flags.get();
   append_curl(cxx_default_flags, ld_flags.value_);
   append_apple_options(cxx_default_flags, ld_flags.value_);
-  std::vector<vk::string_view> external_static_libs{"pcre", "re2", "yaml-cpp", "h3", "z", "zstd", "nghttp2", "kphp-timelib"};
+  std::vector<vk::string_view> external_static_libs{"pcre", "re2", "yaml-cpp", "h3", "z", "zstd", "nghttp2", "kphp-timelib", "ucontext"};
+
+ld_flags.value_ += " -L /usr/local/lib";
 
 #ifdef KPHP_TIMELIB_LIB_DIR
   ld_flags.value_ += " -L" KPHP_TIMELIB_LIB_DIR;
@@ -331,7 +333,8 @@ void CompilerSettings::init() {
   ld_flags.value_ += " -L /usr/local/lib";
 #endif
 
-#if defined(__APPLE__) && defined(__arm64__)
+#if defined(__APPLE__) && !defined(__arm64__)
+  external_static_libs.pop_back();
   // for development under M1, manual installation of libucontext is needed
   // see the docs: https://vkcom.github.io/kphp/kphp-internals/developing-and-extending-kphp/compiling-kphp-from-sources.html
   ld_flags.value_ += " /opt/homebrew/lib/libucontext.a";

server/ucontext-portable.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#if !(defined(__APPLE__) && defined(__arm64__))
+#if defined(__APPLE__) && !defined(__arm64__)
 // for x86 mac or x86/arm linux, we just use makecontext(), ucontext_t and other native functions
 #include <ucontext.h>
 

tests/tests.cmake

@@ -3,7 +3,9 @@ if(KPHP_TESTS)
         set(TEST_NAME unittests-${TEST_NAME})
         add_executable(${TEST_NAME} ${ARGN})
         target_link_libraries(${TEST_NAME} PRIVATE GTest::GTest GTest::Main gmock ${SRC_LIBS} vk::popular_common)
-        if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND APPLE)
+        if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT APPLE)
+            target_link_libraries(${TEST_NAME} PRIVATE /usr/local/lib/libucontext.a)
+        elseif(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
             target_link_libraries(${TEST_NAME} PRIVATE /opt/homebrew/lib/libucontext.a)
         endif()
         target_link_options(${TEST_NAME} PRIVATE ${NO_PIE})