pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #80512 from xfix/tor-disable-monotonic-tests

tor: fix build

authored by

Maximilian Bosch and committed by
GitHub 5ea19307 9bab9e2e

+28 -1
unified split
+2 -1
pkgs/tools/security/tor/default.nix
··· 28 28 buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ 29 29 stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; 30 30 31 + patches = [ ./disable-monotonic-timer-tests.patch ]; 32 + 31 33 NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; 32 34 33 35 postPatch = '' ··· 39 41 ''; 40 42 41 43 enableParallelBuilding = true; 42 - enableParallelChecking = false; # 4 tests fail randomly 43 44 44 45 doCheck = true; 45 46
+26
pkgs/tools/security/tor/disable-monotonic-timer-tests.patch
··· 1 + diff --git a/src/test/test_util.c b/src/test/test_util.c 2 + index 0d86a5ab5..e93c6ba89 100644 3 + --- a/src/test/test_util.c 4 + +++ b/src/test/test_util.c 5 + @@ -5829,13 +5829,9 @@ test_util_monotonic_time(void *arg) 6 + /* We need to be a little careful here since we don't know the system load. 7 + */ 8 + tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_GE, 175); 9 + - tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_LT, 1000); 10 + tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_GE, 125); 11 + - tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_LT, 1000); 12 + tt_u64_op(nsec2-nsec1, OP_GE, 175000000); 13 + - tt_u64_op(nsec2-nsec1, OP_LT, 1000000000); 14 + tt_u64_op(nsecc2-nsecc1, OP_GE, 125000000); 15 + - tt_u64_op(nsecc2-nsecc1, OP_LT, 1000000000); 16 + 17 + tt_u64_op(msec1, OP_GE, nsec1 / 1000000); 18 + tt_u64_op(usec1, OP_GE, nsec1 / 1000); 19 + @@ -5849,7 +5845,6 @@ test_util_monotonic_time(void *arg) 20 + uint64_t coarse_stamp_diff = 21 + monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1); 22 + tt_u64_op(coarse_stamp_diff, OP_GE, 120); 23 + - tt_u64_op(coarse_stamp_diff, OP_LE, 1200); 24 + 25 + { 26 + uint64_t units = monotime_msec_to_approx_coarse_stamp_units(5000);