diff options
| author | nikita <nikita@NetBSD.org> | 2021-01-13 00:53:52 +0100 |
|---|---|---|
| committer | nikita <nikita@NetBSD.org> | 2021-01-13 00:53:52 +0100 |
| commit | 5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb (patch) | |
| tree | d69e840805484efba1885154b855bf93409248cb /scripts/travis | |
| parent | 7bd28f37397837d72302550e43d95060413e9eb8 (diff) | |
| parent | e052859759b34d0e05ce0f17244873e5cd7b457b (diff) | |
| download | gnurl-5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb.tar.gz gnurl-5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb.tar.bz2 gnurl-5b9f8acdda96cbaf7ec070db3ae9bdbe2a42f8eb.zip | |
Merge tag 'curl-7_74_0'
7.74.0
Diffstat (limited to 'scripts/travis')
| -rwxr-xr-x | scripts/travis/before_script.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis/iconv-env.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis/script.sh | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index 92f5cb233..ffa5e209a 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -10,7 +10,7 @@ # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms -# are also available at https://curl.haxx.se/docs/copyright.html. +# are also available at https://curl.se/docs/copyright.html. # # You may opt to use, copy, modify, merge, publish, distribute and/or sell # copies of the Software, and permit persons to whom the Software is diff --git a/scripts/travis/iconv-env.sh b/scripts/travis/iconv-env.sh index 129eb10a9..bf4b87662 100755 --- a/scripts/travis/iconv-env.sh +++ b/scripts/travis/iconv-env.sh @@ -9,7 +9,7 @@ # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms -# are also available at https://curl.haxx.se/docs/copyright.html. +# are also available at https://curl.se/docs/copyright.html. # # You may opt to use, copy, modify, merge, publish, distribute and/or sell # copies of the Software, and permit persons to whom the Software is diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index 7f9e56adc..49d45b700 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -10,7 +10,7 @@ # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms -# are also available at https://curl.haxx.se/docs/copyright.html. +# are also available at https://curl.se/docs/copyright.html. # # You may opt to use, copy, modify, merge, publish, distribute and/or sell # copies of the Software, and permit persons to whom the Software is @@ -49,7 +49,7 @@ if [ "$T" = "debug" ]; then make make examples if [ -z $NOTESTS ]; then - make TFLAGS=-n test-nonflaky + make test-nonflaky fi fi @@ -106,6 +106,7 @@ fi if [ "$T" = "cmake" ]; then cmake -H. -Bbuild -DCURL_WERROR=ON $C cmake --build build + env TFLAGS="!1139" cmake --build build --target test-nonflaky fi if [ "$T" = "distcheck" ]; then |