]> granicus.if.org Git - libevent/commitdiff
CI: integrate testing for components export
authoryuangongji <82787816@qq.com>
Thu, 14 Nov 2019 10:34:56 +0000 (18:34 +0800)
committeryuangongji <82787816@qq.com>
Fri, 15 Nov 2019 14:00:41 +0000 (22:00 +0800)
.travis.yml
appveyor.yml

index 6cb0775153474ef714e64f5c7a7b339c621ab09b..96825bd61e2fdf75e5a86a5755dd83269c72fdbc 100644 (file)
@@ -42,6 +42,11 @@ matrix:
     # coveralls
     - os: linux
       env: EVENT_BUILD_METHOD=cmake EVENT_CMAKE_OPTIONS="-DEVENT__COVERAGE=ON -DCMAKE_BUILD_TYPE=debug" COVERALLS=yes
+    # test-export
+    - os: linux
+      env: EVENT_BUILD_METHOD=cmake EVENT_CMAKE_OPTIONS="-DEVENT__LIBRARY_TYPE=STATIC -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_SAMPLES=ON" TEST_EXPORT=STATIC
+    - os: linux
+      env: EVENT_BUILD_METHOD=cmake EVENT_CMAKE_OPTIONS="-DEVENT__LIBRARY_TYPE=SHARED -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_SAMPLES=ON" TEST_EXPORT=SHARED
     # for openssl1.1
     - os: linux
       dist: bionic
@@ -124,9 +129,16 @@ script:
 
       mkdir build &&
       cd build &&
-      cmake .. $EVENT_CMAKE_OPTIONS &&
-      travis_wait $TIMEOUT
-      cmake --build . --target verify;
+      cmake .. $EVENT_CMAKE_OPTIONS;
+      if [ "$TEST_EXPORT" == "STATIC" ]; then
+        cmake --build .;
+        sudo python3 ../test-export/test-export.py static;
+      elif [ "$TEST_EXPORT" == "SHARED" ]; then
+        cmake --build .;
+        sudo python3 ../test-export/test-export.py shared;
+      else
+        travis_wait $TIMEOUT cmake --build . --target verify;
+      fi
     fi
   - if [ "$TOOL" == "doxygen" ]; then
       eval "$(ssh-agent -s)";
index ec08a1ce410b23086372f8712518e85f74724b19..a2687237e20407e16f2e3375bc74944250ffacd9 100644 (file)
@@ -23,6 +23,7 @@ environment:
   global:
     APPVEYOR_SAVE_CACHE_ON_ERROR: true
     OPENSSL_ROOT: C:/OpenSSL-Win64
+    PYTHON3: C:/Python37-x64/python.exe
     MPATH: C:/mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1/mingw64/bin;C:/msys64/usr/bin
     EVENT_TESTS_PARALLEL: 20
     EVENT_BUILD_PARALLEL: 10
@@ -66,6 +67,14 @@ environment:
     - EVENT_BUILD_METHOD: "cmake"
       EVENT_CMAKE_OPTIONS: ""
       APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
+    - EVENT_BUILD_METHOD: "cmake"
+      EVENT_CMAKE_OPTIONS: "-DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_SAMPLES=ON"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+      TEST_EXPORT: "SHARED"
+    - EVENT_BUILD_METHOD: "cmake"
+      EVENT_CMAKE_OPTIONS: "-DEVENT__LIBRARY_TYPE=STATIC -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_SAMPLES=ON"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+      TEST_EXPORT: "STATIC"
 
 matrix:
   exclude:
@@ -123,7 +132,13 @@ build_script:
         if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
         cmake --build . -j $env:EVENT_BUILD_PARALLEL -- /nologo /verbosity:minimal
         if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
-        ctest --output-on-failure -j $env:EVENT_TESTS_PARALLEL
+        if ($env:TEST_EXPORT -eq 'STATIC') {
+          &$env:PYTHON3 ../test-export/test-export.py static
+        } elseif ($env:TEST_EXPORT -eq 'SHARED') {
+          &$env:PYTHON3 ../test-export/test-export.py shared
+        } else {
+          ctest --output-on-failure -j $env:EVENT_TESTS_PARALLEL
+        }
       }
 
 cache: