Commit 6ef09c00 authored by OPNA2608's avatar OPNA2608
Browse files

dbus-cpp: Changes to tests 

- Apply a patch that should make a possibly-flaky test more verbose, to ease with debugging.
- Disable the executor test suite, due to a spurious memory corruption in Executor.TimeoutsAreHandledCorrectly.
parent 9e32dc6d

pkgs/by-name/db/dbus-cpp/package.nix

+19 −0
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
  stdenv,

  lib,

  fetchFromGitLab,

  fetchpatch2,

  gitUpdater,

  testers,

  boost186,

  cmake,

  ctestCheckHook,

  dbus,

  doxygen,

  graphviz,
@@ -35,6 +37,16 @@ stdenv.mkDerivation (finalAttrs: { 
    "examples"

  ];



  patches = [

    # Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks

    # Remove when version > 5.0.5

    (fetchpatch2 {

      name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name";

      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff";

      hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4=";

    })

  ];



  postPatch = ''

    substituteInPlace doc/CMakeLists.txt \

      --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
@@ -71,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  nativeCheckInputs = [

    ctestCheckHook

    dbus

  ];
@@ -87,6 +100,12 @@ stdenv.mkDerivation (finalAttrs: { 
  # DBus, parallelism messes with communication

  enableParallelChecking = false;



  disabledTests = [

    # Possible memory corruption in Executor.TimeoutsAreHandledCorrectly

    # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10

    "executor_test"

  ];



  preFixup = ''

    moveToOutput libexec/examples $examples

  '';