diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-06 10:54:24 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-06 06:54:29 -0400 |
| commit | ad2ac18a2347e3d447ddf2591955efdd4984a35d (patch) | |
| tree | 7886b191ba992b4e4df98bd68d4eada2f2eeddc1 /Tests | |
| parent | 971c239c4b7dd22317a8b5eb47b7f8ea438fa1c5 (diff) | |
| parent | 0792fe47590a42525ac5bfd774f956a0b5e09e20 (diff) | |
| download | cmake-ad2ac18a2347e3d447ddf2591955efdd4984a35d.tar.gz | |
Merge topic 'ci-find-modules'
0792fe4759 ci: enable IPO tests on Debian 10 and Fedora 31 builds
c582e51909 ci: enable Fortran submodule tests on Debian 10 and Fedora 31 builds
12b56269d4 ci: enable Qt5 tests on Debian 10 and Fedora 31 builds
02e8befb74 gitlab-ci: add job to run test suite on Debian 10 with ninja
2bb2a283e9 ci: add packages for many find modules to the Debian 10 image
03fb06b8e7 ci: enable many find module tests for the Fedora 31 Makefiles build
b23f36bba6 ci: add packages for many find modules to the Fedora 31 image
20f7d51b7b Tests: Revise FindBLAS test to avoid cblas_ mangling
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5322
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/FindBLAS/Test/main.c | 8 | ||||
| -rw-r--r-- | Tests/FindRuby/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/FindRuby/Rvm/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/Tests/FindBLAS/Test/main.c b/Tests/FindBLAS/Test/main.c index 7360deec62..e61b02cbe8 100644 --- a/Tests/FindBLAS/Test/main.c +++ b/Tests/FindBLAS/Test/main.c @@ -2,13 +2,15 @@ #include <string.h> // declare what parts of the blas C-API we need -void cblas_dswap(const int N, double* X, const int incX, double* Y, - const int incY); +void dswap_(int* N, double* X, int* incX, double* Y, int* incY); int main() { double x[4] = { 1, 2, 3, 4 }; double y[4] = { 8, 7, 7, 6 }; - cblas_dswap(4, x, 1, y, 1); + int N = 4; + int incX = 1; + int incY = 1; + dswap_(&N, x, &incX, y, &incY); return 0; } diff --git a/Tests/FindRuby/CMakeLists.txt b/Tests/FindRuby/CMakeLists.txt index 3f4807c53a..ee589234de 100644 --- a/Tests/FindRuby/CMakeLists.txt +++ b/Tests/FindRuby/CMakeLists.txt @@ -24,7 +24,7 @@ if(CMake_TEST_FindRuby) --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) set_tests_properties(FindRuby.Fail PROPERTIES - PASS_REGULAR_EXPRESSION "Could NOT find Ruby.*(Required is at least version \"[0-9]+\\.[0-9]+\\.[0-9]+\")") + PASS_REGULAR_EXPRESSION "Could NOT find Ruby.*(Required[ \n]+is[ \n]+at[ \n]+least[ \n]+version[ \n]*\"[0-9]+\\.[0-9]+\\.[0-9]+\")") # Looks for 1.9.9 EXACTLY, which unlike the "FindRuby" test above will fail on every machine # since this version doesn't exist (ruby goes from 1.9.3 to 2.0.0) diff --git a/Tests/FindRuby/Rvm/CMakeLists.txt b/Tests/FindRuby/Rvm/CMakeLists.txt index 545fc9480f..14bdbec83b 100644 --- a/Tests/FindRuby/Rvm/CMakeLists.txt +++ b/Tests/FindRuby/Rvm/CMakeLists.txt @@ -23,7 +23,7 @@ if (result) message (FATAL_ERROR "Unable to detect RVM ruby version from `${MY_RUBY_HOME}/bin/ruby`: ${RVM_RUBY_VERSION}") endif() -execute_process(COMMAND "${CMAKE_COMMAND}" -E env --unset=MY_RUBY_HOME --unset=PATH +execute_process(COMMAND "${CMAKE_COMMAND}" -E env --unset=MY_RUBY_HOME PATH=/usr/bin:/bin "which" "ruby" RESULT_VARIABLE result OUTPUT_VARIABLE SYSTEM_RUBY |