From cdb3e09870491b4b3f48aa378ab47180e268b5ed Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 12:35:36 -0300 Subject: [PATCH 1/7] Adds Makefile build lib and test --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1dab38f3c..6b00b86af0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,3 +53,11 @@ script: make coverage; bash <(curl -s https://codecov.io/bash) -X gcov; fi + - | + if [[ "$CMAKE_BUILD_TYPE" == "Release" ]]; then + echo "Testing Makefile" + rm make.inc + cp make.inc.example make.inc + make lib -j2 + make test -j2 + fi \ No newline at end of file From 26a505d03880299db3309399ceab8d06a60482f2 Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 13:33:53 -0300 Subject: [PATCH 2/7] Test Makefile only --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b00b86af0..e4f3c3661a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,21 @@ addons: matrix: include: + # - os: linux + # env: CMAKE_BUILD_TYPE=Release - os: linux - env: CMAKE_BUILD_TYPE=Release - - os: linux - env: CMAKE_BUILD_TYPE=Coverage - - os: osx - osx_image: xcode10.3 - env: CMAKE_BUILD_TYPE=Release + script: + - echo "Testing Makefile" + - rm make.inc + - cp make.inc.example make.inc + - make clean + - make lib -j2 + - make test -j2 + # - os: linux + # env: CMAKE_BUILD_TYPE=Coverage + # - os: osx + # osx_image: xcode10.3 + # env: CMAKE_BUILD_TYPE=Release script: - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST @@ -52,12 +60,4 @@ script: echo "Coverage"; make coverage; bash <(curl -s https://codecov.io/bash) -X gcov; - fi - - | - if [[ "$CMAKE_BUILD_TYPE" == "Release" ]]; then - echo "Testing Makefile" - rm make.inc - cp make.inc.example make.inc - make lib -j2 - make test -j2 fi \ No newline at end of file From 34e233f5675c9b377ef2d11aa7c492eafd64d655 Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 13:38:01 -0300 Subject: [PATCH 3/7] Fix typo --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4f3c3661a..b28517a3b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,7 @@ matrix: - rm make.inc - cp make.inc.example make.inc - make clean - - make lib -j2 - - make test -j2 + - make all -j2 # - os: linux # env: CMAKE_BUILD_TYPE=Coverage # - os: osx From 7c1cfaec8a72b3b75c2df7c8b0cb984ba9981d27 Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 13:56:01 -0300 Subject: [PATCH 4/7] Adds Makefile tests on Linux and Mac OS X --- .travis.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index b28517a3b8..2e24273459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,25 +13,32 @@ addons: matrix: include: - # - os: linux - # env: CMAKE_BUILD_TYPE=Release - os: linux + env: CMAKE_BUILD_TYPE=Release + - os: linux + name: "Makefile Test on Linux" + script: + - rm -f make.inc + - cp make.inc.example make.inc + - make -s -j2 all + - make -j2 install + - os: linux + env: CMAKE_BUILD_TYPE=Coverage + - os: osx + osx_image: xcode10.3 + name: "Makefile Test on Linux" script: - - echo "Testing Makefile" - - rm make.inc + - rm -f make.inc - cp make.inc.example make.inc - - make clean - - make all -j2 - # - os: linux - # env: CMAKE_BUILD_TYPE=Coverage - # - os: osx - # osx_image: xcode10.3 - # env: CMAKE_BUILD_TYPE=Release + - make -s -j2 all + - make -j2 install -script: +before_script: - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi) - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH" + +script: - export SRC_DIR=$(pwd) - export BLD_DIR=${SRC_DIR}/lapack-travis-bld - export INST_DIR=${SRC_DIR}/../lapack-travis-install From 2c1576dd4a38f3581bb05f0117e67de10560f375 Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 13:58:19 -0300 Subject: [PATCH 5/7] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e24273459..e412ec13d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: env: CMAKE_BUILD_TYPE=Coverage - os: osx osx_image: xcode10.3 - name: "Makefile Test on Linux" + name: "Makefile Test on Mac OS X" script: - rm -f make.inc - cp make.inc.example make.inc From fdc0c6c42a58838b505013e75aebc6c9b858318e Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 14:11:55 -0300 Subject: [PATCH 6/7] Fix typos --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e412ec13d2..4584dd4b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: matrix: include: - os: linux + name: "CMake Release Test on Linux" env: CMAKE_BUILD_TYPE=Release - os: linux name: "Makefile Test on Linux" @@ -21,9 +22,14 @@ matrix: - rm -f make.inc - cp make.inc.example make.inc - make -s -j2 all - - make -j2 install + - make -j2 lapack_install - os: linux + name: "CMake Coverage Test on Linux" env: CMAKE_BUILD_TYPE=Coverage + - os: osx + name: "CMake Release Test on Mac OS X" + osx_image: xcode10.3 + env: CMAKE_BUILD_TYPE=Release - os: osx osx_image: xcode10.3 name: "Makefile Test on Mac OS X" @@ -31,7 +37,7 @@ matrix: - rm -f make.inc - cp make.inc.example make.inc - make -s -j2 all - - make -j2 install + - make -j2 lapack_install before_script: - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST From d0deb4b08502fc4bf2956226ce42a10a6953705d Mon Sep 17 00:00:00 2001 From: "weslley.spereira" Date: Mon, 1 Mar 2021 14:18:51 -0300 Subject: [PATCH 7/7] Adds EOF --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4584dd4b99..b12938ca3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,4 +72,4 @@ script: echo "Coverage"; make coverage; bash <(curl -s https://codecov.io/bash) -X gcov; - fi \ No newline at end of file + fi