From 561fcd29a13a3a40de255f21cd943de1f6c7d5d9 Mon Sep 17 00:00:00 2001 From: Stuart D. Gathman Date: May 08 2019 23:34:58 +0000 Subject: Increase fuzz timeout for slower arches --- diff --git a/cjdns.fuzz.patch b/cjdns.fuzz.patch new file mode 100644 index 0000000..3faaed6 --- /dev/null +++ b/cjdns.fuzz.patch @@ -0,0 +1,21 @@ +diff -up ./test/Main_fuzz_test.c.fuzz ./test/Main_fuzz_test.c +--- ./test/Main_fuzz_test.c.fuzz 2019-05-08 19:31:34.995364838 -0400 ++++ ./test/Main_fuzz_test.c 2019-05-08 19:31:51.955608910 -0400 +@@ -59,8 +59,8 @@ static Iface_DEFUN incomingTun(struct Me + static void notLinkedYet(struct Context* ctx) + { + uint64_t now = Time_currentTimeMilliseconds(ctx->base); +- if ((now - ctx->startTime) > 5000) { +- Assert_failure("Failed to link in 5 seconds"); ++ if ((now - ctx->startTime) > 100000) { ++ Assert_failure("Failed to link in 100 seconds"); + } + } + +@@ -185,4 +185,4 @@ void CJDNS_FUZZ_MAIN(void* vctx, struct + TestFramework_assertLastMessageUnaltered(ctx->nodeA); + + EventBase_beginLoop(ctx->base); +-} +\ No newline at end of file ++} diff --git a/cjdns.spec b/cjdns.spec index 2474244..8b691c1 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -72,7 +72,7 @@ Name: cjdns # major version is cjdns protocol version: Version: 20.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The privacy-friendly network without borders # cjdns is all GPLv3 except libuv which is MIT and BSD and ISC # cnacl is unused except when use_embedded is true @@ -134,6 +134,7 @@ Patch16: cjdns.python3.patch #Patch17: cjdns.s390x.patch # patch build to use system libuv Patch18: cjdns.libuv.patch +Patch19: cjdns.fuzz.patch BuildRequires: nodejs, nodejs-ronn, python2 @@ -163,11 +164,6 @@ Provides: bundled(nacl) = 20110221 %endif # build system requires nodejs, unfortunately ExclusiveArch: %{nodejs_arches} -%if 0%{use_embedded} - # The nodejs build system for embedded cnacl has no "plan" for s390x. - # It might work to copy another big endian plan like ppc64. -ExcludeArch: s390x ppc64le armv7hl -%endif %description Cjdns implements an encrypted IPv6 network using public-key cryptography for @@ -281,6 +277,7 @@ mkdir dependencies cp node_build/dependencies/libuv/include/tree.h dependencies/uv_tree.h rm -rf node_build/dependencies/libuv %endif +%patch19 -p1 -b .fuzz cp %{SOURCE1} README_Fedora.md @@ -609,6 +606,9 @@ fi %{_bindir}/graphStats %changelog +* Wed May 08 2019 Stuart Gathman - 20.3-2 +- Increase timeout for fuzz tests to allow slower arches to succeed + * Wed May 08 2019 Stuart Gathman - 20.3-1 - New upstream version 20.3