From 4a2985da5b7763942358ee1f6b0d9329325a9553 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 7 Jun 2020 19:28:08 +0200 Subject: [PATCH 1/4] test: changed arch to arm32v7 only --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b78b99..dc71554 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,11 @@ env: global: - DOCKER_BUILDKIT=0 matrix: - - DISTRIB_ID=ubuntu VARIANT=debug MARCH=x86_64 CHECK_TARGET=memcheck - - DISTRIB_ID=ubuntu VARIANT=coverage MARCH=x86_64 CHECK_TARGET=check - - DISTRIB_ID=ubuntu VARIANT=release MARCH=x86_64 CHECK_TARGET=memcheck - - DISTRIB_ID=ubuntu VARIANT=debug MARCH=arm32v7 CHECK_TARGET=check - - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check - - DISTRIB_ID=alpine VARIANT=debug MARCH=x86_64 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=debug MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=release MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=release MARCH=arm32v7 CHECK_TARGET=check before_script: - make -j4 DISTRIB_ID=$DISTRIB_ID VARIANT=$VARIANT MARCH=$MARCH script: From 21dd96cdfbd46aca85a28cdc48664befce593bb9 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Mon, 8 Jun 2020 19:09:52 +0200 Subject: [PATCH 2/4] removed duplicate configurations --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc71554..7d0e33b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,9 @@ env: global: - DOCKER_BUILDKIT=0 matrix: - - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check - DISTRIB_ID=ubuntu VARIANT=debug MARCH=arm32v7 CHECK_TARGET=check - DISTRIB_ID=ubuntu VARIANT=release MARCH=arm32v7 CHECK_TARGET=check - - DISTRIB_ID=ubuntu VARIANT=release MARCH=arm32v7 CHECK_TARGET=check before_script: - make -j4 DISTRIB_ID=$DISTRIB_ID VARIANT=$VARIANT MARCH=$MARCH script: From df57043445afef038fce5f25e7cee93b5bbe878d Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Mon, 8 Jun 2020 19:10:35 +0200 Subject: [PATCH 3/4] fix: invalid memory access fixed --- test/webfuse/tests/integration/provider.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/webfuse/tests/integration/provider.cc b/test/webfuse/tests/integration/provider.cc index a4b4473..cf3aeca 100644 --- a/test/webfuse/tests/integration/provider.cc +++ b/test/webfuse/tests/integration/provider.cc @@ -50,9 +50,8 @@ class Provider::Private public: explicit Private(char const * url) : is_shutdown_requested(false) + , connection_state(ConnectionState::connecting) { - ConnectionState connection_state = ConnectionState::connecting; - config = wfp_client_config_create(); wfp_client_config_set_certpath(config, "client-cert.pem"); wfp_client_config_set_keypath(config, "client-key.pem"); @@ -92,6 +91,12 @@ public: RequestShutdown(); thread.join(); + wfp_client_disconnect(client); + while (ConnectionState::disconnected != connection_state) + { + wfp_client_service(client); + } + wfp_client_dispose(client); wfp_static_filesystem_dispose(fs); @@ -117,17 +122,12 @@ private: { wfp_client_service(context->client); } - - wfp_client_disconnect(context->client); - while (wfp_impl_client_is_connected(context->client)) - { - wfp_client_service(context->client); - } } std::mutex shutdown_lock; std::thread thread; bool is_shutdown_requested; + ConnectionState connection_state; wfp_client_config * config; wfp_static_filesystem * fs; From bbae4a0efee478e85a225eecd527ff897520ed47 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Mon, 8 Jun 2020 19:54:08 +0200 Subject: [PATCH 4/4] reverted travis config --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d0e33b..0b78b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,12 @@ env: global: - DOCKER_BUILDKIT=0 matrix: - - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check - - DISTRIB_ID=ubuntu VARIANT=debug MARCH=arm32v7 CHECK_TARGET=check - - DISTRIB_ID=ubuntu VARIANT=release MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=debug MARCH=x86_64 CHECK_TARGET=memcheck + - DISTRIB_ID=ubuntu VARIANT=coverage MARCH=x86_64 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=release MARCH=x86_64 CHECK_TARGET=memcheck + - DISTRIB_ID=ubuntu VARIANT=debug MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check + - DISTRIB_ID=alpine VARIANT=debug MARCH=x86_64 CHECK_TARGET=check before_script: - make -j4 DISTRIB_ID=$DISTRIB_ID VARIANT=$VARIANT MARCH=$MARCH script: