From 802008a5212840bbcebc9782954a0fcd5f4d04d8 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Fri, 22 Feb 2019 20:17:53 -0700 Subject: [PATCH 01/12] Add tester.csh script, supporting mods to Makefile --- Makefile | 1 + tester.csh | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100755 tester.csh diff --git a/Makefile b/Makefile index 12703e4..94f9d0c 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ run_this.o : run_this.f90 test : ./a.out + ./tester.csh clean : rm -f a.out run_this.o diff --git a/tester.csh b/tester.csh new file mode 100755 index 0000000..41640c2 --- /dev/null +++ b/tester.csh @@ -0,0 +1,6 @@ +#/bin/csh + +grep -q 2 fort.10 +set OK = $status +echo $OK +exit ( $OK ) From a89b381479cf5563124b010788e125a5bd272ea1 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Fri, 22 Feb 2019 20:27:37 -0700 Subject: [PATCH 02/12] Fix error in script, should now pass --- tester.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tester.csh b/tester.csh index 41640c2..9985a8b 100755 --- a/tester.csh +++ b/tester.csh @@ -1,6 +1,6 @@ #/bin/csh -grep -q 2 fort.10 +grep -q 1 fort.10 set OK = $status echo $OK exit ( $OK ) From f77164941b16c54871dd5002f8b0480a786217fb Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Fri, 22 Feb 2019 20:40:32 -0700 Subject: [PATCH 03/12] Add in part to output a "1" for fort.10 --- run_this.f90 | 1 + 1 file changed, 1 insertion(+) diff --git a/run_this.f90 b/run_this.f90 index 8148cad..5d0cce4 100644 --- a/run_this.f90 +++ b/run_this.f90 @@ -1,3 +1,4 @@ program run_this print *,'Hmmm, program seemed to run' +write (10,*) 1 end program run_this From 531917103ed08708b90e825c153519f347633582 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Fri, 22 Feb 2019 21:01:05 -0700 Subject: [PATCH 04/12] Try to get some debugging output --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index efdf6cc..f1b539d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,12 @@ script: make test fi +after_failure: + - echo $TRAVIS_OS_NAME + - ls -ls + - cat fort.10 + - echo Your build FAILED + #====================================================================== # Notifications #====================================================================== From aaccfd5f2d8493c152f009e0225541dd9024ceac Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Fri, 22 Feb 2019 21:03:06 -0700 Subject: [PATCH 05/12] Adding in the "sleep" thing, some recommended it --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f1b539d..547288a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,6 +75,7 @@ script: fi after_failure: + - sleep 1 - echo $TRAVIS_OS_NAME - ls -ls - cat fort.10 From cd3a52f359495b48f4e5e2f9466080489be5435b Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Tue, 26 Feb 2019 09:20:41 -0500 Subject: [PATCH 06/12] Forgot the "!" character in the csh shell line --- tester.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tester.csh b/tester.csh index 9985a8b..a84b075 100755 --- a/tester.csh +++ b/tester.csh @@ -1,4 +1,4 @@ -#/bin/csh +#!/bin/csh grep -q 1 fort.10 set OK = $status From fe1b83988f61f36a3319610fa3807bc8998edf83 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Tue, 26 Feb 2019 09:35:11 -0500 Subject: [PATCH 07/12] Add a few extra echo statements in yml file for debugging --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 547288a..2615500 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,24 +42,27 @@ matrix: before_install: - | if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then - brew install gcc@7 || true; - brew link --overwrite gcc@7; + brew install gcc@7 || true + brew link --overwrite gcc@7 + echo "TRAVIS OS OSX BREW" fi - | if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then pip install --user cpp-coveralls + echo "TRAVIS OS LINUX PIP" fi before_script: - | if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then - export CC="clang" FC="gfortran-7" CXX="clang++" ; + export CC="clang" FC="gfortran-7" CXX="clang++" + echo "TRAVIS OS OSX clang" fi - | if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then - export CC="gcc-6" FC="gfortran-6" CXX="g++-6" ; + export CC="gcc-6" FC="gfortran-6" CXX="g++-6" + echo "TRAVIS OS OSX gfortran" fi -# - export CC="gcc-6" FC="gfortran-6" CXX="g++-6" ; script: - make @@ -67,11 +70,13 @@ script: if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then export LD_LIBRARY_PATH=${PWD}/schemes/check/src/check-build make test + echo "TRAVIS OS LINUX make test" fi - | if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then export DYLD_LIBRARY_PATH=${PWD}/schemes/check/src/check-build make test + echo "TRAVIS OS OSX make test" fi after_failure: From d8a7e2e9033a9b4bcd7d97afbdad7c9527a7d471 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Tue, 26 Feb 2019 09:51:19 -0500 Subject: [PATCH 08/12] Do a chmod +x on tester.csh, does that stay --- tester.csh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tester.csh b/tester.csh index a84b075..48a6654 100755 --- a/tester.csh +++ b/tester.csh @@ -1,5 +1,7 @@ #!/bin/csh +# This is a comment + grep -q 1 fort.10 set OK = $status echo $OK From 123e950f4ad3531912475b7961bdc7dd09c106a0 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Tue, 26 Feb 2019 10:20:14 -0500 Subject: [PATCH 09/12] Add ls to Makefile, why is Linux build not finding test.csh --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 94f9d0c..1020be4 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ run_this.o : run_this.f90 test : ./a.out + ls -ls + ls -ls /bin/csh + ls -ls /bin/sh + cat fort.10 ./tester.csh clean : From c1c55e3d61f0db7fb2a23dbd33cf8bc624dd1de4 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Tue, 26 Feb 2019 10:46:17 -0500 Subject: [PATCH 10/12] Add after_success location, whereis sh and csh, fix echo statements --- .travis.yml | 9 ++++++++- Makefile | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2615500..d0bebf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ before_script: - | if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then export CC="gcc-6" FC="gfortran-6" CXX="g++-6" - echo "TRAVIS OS OSX gfortran" + echo "TRAVIS OS LINUX gfortran" fi script: @@ -86,6 +86,13 @@ after_failure: - cat fort.10 - echo Your build FAILED +after_success: + - sleep 1 + - echo $TRAVIS_OS_NAME + - ls -ls + - cat fort.10 + - echo Your build WORKED + #====================================================================== # Notifications #====================================================================== diff --git a/Makefile b/Makefile index 1020be4..43a8c2e 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,10 @@ run_this.o : run_this.f90 test : ./a.out ls -ls - ls -ls /bin/csh + whereis sh + whereis csh ls -ls /bin/sh + ls -ls /bin/csh cat fort.10 ./tester.csh From adb476d3ecd1aed8f89f32d1f9e1c810834ec2de Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Tue, 26 Feb 2019 11:30:13 -0500 Subject: [PATCH 11/12] csh-sh, quote all echo stmts --- .travis.yml | 8 ++++---- Makefile | 4 +--- tester.sh | 8 ++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100755 tester.sh diff --git a/.travis.yml b/.travis.yml index d0bebf1..0b34e14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,17 +81,17 @@ script: after_failure: - sleep 1 - - echo $TRAVIS_OS_NAME + - echo "$TRAVIS_OS_NAME" - ls -ls - cat fort.10 - - echo Your build FAILED + - echo "Your build FAILED" after_success: - sleep 1 - - echo $TRAVIS_OS_NAME + - echo "$TRAVIS_OS_NAME" - ls -ls - cat fort.10 - - echo Your build WORKED + - echo "Your build WORKED" #====================================================================== # Notifications diff --git a/Makefile b/Makefile index 43a8c2e..ee415d7 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,9 @@ test : ./a.out ls -ls whereis sh - whereis csh ls -ls /bin/sh - ls -ls /bin/csh cat fort.10 - ./tester.csh + ./tester.sh clean : rm -f a.out run_this.o diff --git a/tester.sh b/tester.sh new file mode 100755 index 0000000..00992fb --- /dev/null +++ b/tester.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# This is a comment + +grep -q 1 fort.10 +OK=$? +echo $OK +exit $OK From 8c6b353170d99bf0f112275809720bcb62efb942 Mon Sep 17 00:00:00 2001 From: Dave Gill Date: Wed, 27 Feb 2019 09:45:55 -0500 Subject: [PATCH 12/12] rm fort.10 with "make clean" --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index ee415d7..9433da2 100644 --- a/Makefile +++ b/Makefile @@ -16,3 +16,4 @@ test : clean : rm -f a.out run_this.o + rm fort.10