Skip to content

Commit

Permalink
tor: re-enable all test (except a broken one)
Browse files Browse the repository at this point in the history
  • Loading branch information
vcunat committed Aug 17, 2018
1 parent 4af590e commit 5d28c48
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions pkgs/tools/security/tor/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks
, libseccomp, systemd, libcap
, writeText

# for update.nix
, writeScript
Expand All @@ -22,6 +23,19 @@ stdenv.mkDerivation rec {
sha256 = "1vnb2wkcmm8rnz0fqi3k7arl60mpycs8rjn8hvbgv56g3p1pgpv0";
};

patches = [
# https://github.com/NixOS/nixpkgs/pull/45082#issuecomment-413549813
(writeText "disable-test_tortls.diff" ''
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -574,3 +574,4 @@
test_tortls_cert_matches_key(void *ignored)
{
+ return;
(void)ignored;
'')
];

outputs = [ "out" "geoip" ];

enableParallelBuilding = true;
Expand All @@ -44,9 +58,7 @@ stdenv.mkDerivation rec {
rm -rf $out/share/tor
'';

# FIXME: disable/fix one test instead
# https://github.com/NixOS/nixpkgs/pull/45082#issuecomment-413549813
doCheck = false;
doCheck = true;

passthru.updateScript = import ./update.nix {
inherit (stdenv) lib;
Expand Down

0 comments on commit 5d28c48

Please sign in to comment.