Merge pull request eBay#44 from szmyd/master

Disable SPDK testing.

.github/workflows/build_dependencies.yml

@@ -131,18 +131,11 @@ jobs:
 
     - name: Build Cache
       run: |
-        conan install \
-            -o prerelease=${{ inputs.prerelease }} \
-            -o malloc_impl=${{ inputs.malloc-impl }} \
-            -o testing=False \
-            -s build_type=${{ inputs.build-type }} \
-            --build missing \
-            import/sisl
         conan install \
             -o sisl:prerelease=${{ inputs.prerelease }} \
             -o sisl:malloc_impl=${{ inputs.malloc-impl }} \
             -o sisl:testing=False \
-            -o testing=off \
+            -o iomgr:testing=off \
             -s build_type=${{ inputs.build-type }} \
             --build missing \
             .
@@ -163,13 +156,35 @@ jobs:
         fail_on_cache_miss: true
       if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
 
+    - name: Code Coverage Run
+      run: |
+        conan install \
+            -o sisl:prerelease=${{ inputs.prerelease }} \
+            -o sisl:malloc_impl=${{ inputs.malloc-impl }} \
+            -o sisl:testing=False \
+            -o coverage=True \
+            -o testing=epoll_mode \
+            -s build_type=${{ inputs.build-type }} \
+            --build missing \
+            .
+        conan build .
+      if: ${{ inputs.testing == 'True' && inputs.platform == 'ubuntu-22.04' && inputs.build-type == 'Debug' && inputs.malloc-impl == 'libc' && inputs.prerelease == 'False' }}
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        gcov: true
+      if: ${{ inputs.testing == 'True' && inputs.platform == 'ubuntu-22.04' && inputs.build-type == 'Debug' && inputs.malloc-impl == 'libc' && inputs.prerelease == 'False' }}
+
+
     - name: Create and test Package
       run: |
         conan create \
             -o sisl:prerelease=${{ inputs.prerelease }} \
             -o sisl:malloc_impl=${{ inputs.malloc-impl }} \
             -o sisl:testing=False \
-            -o iomgr:testing=off \
+            -o iomgr:testing='epoll_mode' \
             -s build_type=${{ inputs.build-type }} \
             --build missing \
             .

.github/workflows/merge_conan_build.yml

@@ -12,26 +12,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["ubuntu-22.04", "ubuntu-20.04"]
+        platform: ["ubuntu-22.04"]
         build-type: ["Debug", "Release"]
         malloc-impl: ["libc", "tcmalloc", "jemalloc"]
         prerelease: ["True", "False"]
         exclude:
-          - build-type: Debug
-            platform: ubuntu-20.04
-          - malloc-impl: tcmalloc
-            platform: ubuntu-20.04
-          - malloc-impl: jemalloc
-            platform: ubuntu-20.04
           - malloc-impl: jemalloc
             build-type: Debug
+          - malloc-impl: tcmalloc
+            build-type: Debug
+          - malloc-impl: tcmalloc
+            prerelease: "True"
           - malloc-impl: jemalloc
             prerelease: "False"
           - malloc-impl: libc
             build-type: Release
-            platform: ubuntu-22.04
-          - prerelease: "False"
-            build-type: Debug
+
     uses: ./.github/workflows/build_commit.yml
     with:
       platform: ${{ matrix.platform }}

.github/workflows/pr_conan_build.yml

@@ -11,26 +11,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["ubuntu-22.04", "ubuntu-20.04"]
+        platform: ["ubuntu-22.04"]
         build-type: ["Debug", "Release"]
         malloc-impl: ["libc", "tcmalloc", "jemalloc"]
         prerelease: ["True", "False"]
         exclude:
-          - build-type: Debug
-            platform: ubuntu-20.04
-          - malloc-impl: tcmalloc
-            platform: ubuntu-20.04
-          - malloc-impl: jemalloc
-            platform: ubuntu-20.04
           - malloc-impl: jemalloc
             build-type: Debug
+          - malloc-impl: tcmalloc
+            build-type: Debug
           - malloc-impl: jemalloc
             prerelease: "False"
           - malloc-impl: libc
             build-type: Release
-            platform: ubuntu-22.04
-          - prerelease: "False"
-            build-type: Debug
+
     uses: ./.github/workflows/build_commit.yml
     with:
       platform: ${{ matrix.platform }}

.jenkins/Jenkinsfile

@@ -124,7 +124,7 @@ pipeline {
                                 if (("${env.BRANCH_NAME}" =~ /PR-/) && ("$BUILD_TYPE" == "debug")) {
                                     sh "echo Skipping debug build for PR branch"
                                 } else {
-                                    sh "conan create -u ${BUILD_MISSING} -o sisl:prerelease=${PRERELEASE} -o ${PROJECT}:sanitize=${SANITIZE} -pr ${BUILD_PROFILE} . ${PROJECT}/${TAG}"
+                                    sh "conan create ${BUILD_MISSING} -o sisl:prerelease=${PRERELEASE} -o ${PROJECT}:sanitize=${SANITIZE} -pr ${BUILD_PROFILE} . ${PROJECT}/${TAG}"
                                 }
                             }
                         }

CMakeLists.txt

@@ -34,7 +34,9 @@ if(CCACHE_FOUND)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif ()
 
+if(BUILD_TESTING)
 enable_testing()
+endif()
 
 add_subdirectory(src/)
 

README.md

@@ -1,5 +1,6 @@
 # IOManager
 [![Conan Build](https://github.com/eBay/IOManager/actions/workflows/merge_conan_build.yml/badge.svg?branch=master)](https://github.com/eBay/IOManager/actions/workflows/merge_conan_build.yml)
+[![CodeCov](https://codecov.io/gh/eBay/IOManager/branch/master/graph/badge.svg)](https://codecov.io/gh/eBay/IOManager)
 
 IOManager tries to bridge the gap in existing async framework to build full async networked database/storage/keyvalue storage. Motivation 
 and design are explained below.

cmake/debug_flags.cmake

@@ -59,11 +59,10 @@ set (REALLY_NO_OPTIMIZATION_FLAGS "${REALLY_NO_OPTIMIZATION_FLAGS} -fno-web"
 set (REALLY_NO_OPTIMIZATION_FLAGS "${REALLY_NO_OPTIMIZATION_FLAGS} -fno-tree-slp-vectorize"             )# E&C.
 set (REALLY_NO_OPTIMIZATION_FLAGS "${REALLY_NO_OPTIMIZATION_FLAGS} -fthreadsafe-statics"                )# Slightly smaller in code that doesn't need to be TS.
 
-if (DEFINED ${BUILD_COVERAGE})
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${REALLY_NO_OPTIMIZATION_FLAGS}")
+if (DEFINED BUILD_COVERAGE)
   if (${BUILD_COVERAGE})
     include (cmake/CodeCoverage.cmake)
     APPEND_COVERAGE_COMPILER_FLAGS()
-    SETUP_TARGET_FOR_COVERAGE_GCOVR_XML(NAME coverage EXECUTABLE ctest DEPENDENCIES )
   endif ()
 endif ()
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${REALLY_NO_OPTIMIZATION_FLAGS}")

conanfile.py

@@ -31,7 +31,7 @@ class IOMgrConan(ConanFile):
         'grpc_support': True,
         'sanitize':     False,
         'spdk':         True,
-        'testing':      'full',
+        'testing':      'epoll_mode',
         'sisl:prerelease':   True,
         'fiber_impl':   'boost',
     }
@@ -74,15 +74,17 @@ def build(self):
         definitions = {'CMAKE_TEST_TARGET': self.options.testing,
                        'CMAKE_EXPORT_COMPILE_COMMANDS': 'ON',
                        'CONAN_CMAKE_SILENT_OUTPUT': 'ON',
-                       'MEMORY_SANITIZER_ON': 'OFF'}
+                       'MEMORY_SANITIZER_ON': 'OFF',
+                       'BUILD_TESTING': 'OFF',
+        }
+        if self.options.testing:
+            definitions['BUILD_TESTING'] = 'ON'
 
-        test_target = None
         if self.settings.build_type == "Debug":
             if self.options.sanitize:
                 definitions['MEMORY_SANITIZER_ON'] = 'ON'
-            elif self.options.coverage:
-                definitions['BUILD_COVERAGE'] = 'ON'
-                test_target = 'coverage'
+        if self.options.coverage:
+            definitions['BUILD_COVERAGE'] = 'ON'
 
         if self.options.fiber_impl == "boost":
             definitions['FIBER_IMPL'] = 'boost'
@@ -91,7 +93,8 @@ def build(self):
 
         cmake.configure(defs=definitions)
         cmake.build()
-        cmake.test(target=test_target, output_on_failure=True)
+        if self.options.testing:
+            cmake.test(output_on_failure=True)
 
     def package(self):
         copy(self, "LICENSE", self.source_folder, join(self.package_folder, "licenses"), keep_path=False)