Browse Source

Fixed CI recipe, confirmed support for Catch < 2

tastytea 2 months ago
parent
commit
a72149221a
Signed by: tastytea <tastytea@tastytea.de> GPG Key ID: CFC39497F1B26E07
3 changed files with 3 additions and 2 deletions
  1. 1
    1
      .drone.yml
  2. 1
    1
      README.md
  3. 1
    0
      tests.CMakeLists.txt

+ 1
- 1
.drone.yml View File

@@ -43,7 +43,7 @@ pipeline:
43 43
       - rm -rf build && mkdir -p build && cd build
44 44
       - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TESTS=1 ..
45 45
       - make VERBOSE=1
46
-      - for test in test_*; do ${test}; done
46
+      - ctest ..
47 47
       - make install DESTDIR=install
48 48
       - make package
49 49
       - cmake -DWITH_DEB=ON ..

+ 1
- 1
README.md View File

@@ -80,7 +80,7 @@ They are generated on Debian Stretch 64 bit and signed with my
80 80
 * [cmake](https://cmake.org/) (at least 3.2)
81 81
 * [imagemagick](https://www.imagemagick.org/) (tested: 7.0 / 6.7)
82 82
 * Optional:
83
-  * [Catch](https://github.com/catchorg/Catch2) (tested: 2.3.0)
83
+  * [Catch](https://github.com/catchorg/Catch2) (tested: 2.3 / 1.2)
84 84
 
85 85
 On a Debian system, install the packages:
86 86
 `build-essential cmake libmagick++-dev`.

+ 1
- 0
tests.CMakeLists.txt View File

@@ -3,6 +3,7 @@ if(WITH_TESTS)
3 3
     if(Catch2_FOUND)
4 4
         set(MYCATCH, Catch2::Catch2)
5 5
     else()
6
+        message(WARNING "Catch2 not found. Assuming Catch 1.x is installed.")
6 7
         set(MYCATCH, "")
7 8
     endif()
8 9
     include(CTest)

Loading…
Cancel
Save