diff --git a/.travis.yml b/.travis.yml index ff4a6d2bc9..eee16494d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ addons: packages: - libgmp-dev - valgrind - - libtool-bin compiler: - clang - gcc @@ -41,7 +40,6 @@ matrix: - gcc-multilib - libgmp-dev:i386 - valgrind - - libtool-bin - libc6-dbg:i386 - compiler: clang env: HOST=i686-linux-gnu @@ -50,7 +48,6 @@ matrix: packages: - gcc-multilib - valgrind - - libtool-bin - libc6-dbg:i386 - compiler: gcc env: HOST=i686-linux-gnu ENDOMORPHISM=yes @@ -59,7 +56,6 @@ matrix: packages: - gcc-multilib - valgrind - - libtool-bin - libc6-dbg:i386 - compiler: gcc env: HOST=i686-linux-gnu @@ -69,7 +65,6 @@ matrix: - gcc-multilib - libgmp-dev:i386 - valgrind - - libtool-bin - libc6-dbg:i386 - compiler: gcc env: @@ -95,7 +90,7 @@ script: travis_wait 30 valgrind --error-exitcode=42 ./exhaustive_tests; fi - if [ -n "$CTIMETEST" ]; then - libtool --mode=execute valgrind ./valgrind_ctime_test &> valgrind_ctime_test.log; + ./libtool --mode=execute valgrind ./valgrind_ctime_test &> valgrind_ctime_test.log; fi after_script: diff --git a/src/valgrind_ctime_test.c b/src/valgrind_ctime_test.c index 24b5887450..9186172aa0 100644 --- a/src/valgrind_ctime_test.c +++ b/src/valgrind_ctime_test.c @@ -27,7 +27,7 @@ int main(void) { if (!RUNNING_ON_VALGRIND) { fprintf(stderr, "This test can only usefully be run inside valgrind.\n"); - fprintf(stderr, "Usage: libtool --mode=execute valgrind ./valgrind_ctime_test\n"); + fprintf(stderr, "Usage: ./libtool --mode=execute valgrind ./valgrind_ctime_test\n"); exit(99); /* indicates "ERROR" in make check */ } diff --git a/valgrind_ctime_test.sh b/valgrind_ctime_test.sh index 6b90242d2d..10def4a518 100755 --- a/valgrind_ctime_test.sh +++ b/valgrind_ctime_test.sh @@ -1,9 +1,9 @@ #!/bin/sh -libtool --mode=execute valgrind --error-exitcode=1 ./valgrind_ctime_test "$@" +./libtool --mode=execute valgrind --error-exitcode=1 ./valgrind_ctime_test "$@" case $? in - 127) # "command not found", i.e., either libtool or valgrind not installed + 127) # "command not found", i.e., valgrind not installed exit 77 # map this to "SKIP" (=77) for make check ;; *)