aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-03-16 22:21:37 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-03-17 09:55:35 +0100
commitd83402813b624d9067416bea2e7feb70a358cf65 (patch)
treef5fdef70706ab5678f7e2e10bf4b085978d9321e
parent8a2b36df5be258db32d05a0466554150d3fabfb2 (diff)
CI: stop ignoring 323, it is disabled
-rw-r--r--.azure-pipelines.yml14
-rw-r--r--.cirrus.yml4
-rwxr-xr-xscripts/travis/script.sh7
3 files changed, 10 insertions, 15 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 9962c11f4..42dd83c5b 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -43,7 +43,7 @@ stages:
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
- TFLAGS: "~323"
+ TFLAGS: ""
- job: disable_ipv6
displayName: ubuntu w/o IPv6
@@ -64,7 +64,7 @@ stages:
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
- TFLAGS: "~323"
+ TFLAGS: ""
- job: disable_http_smtp_imap
displayName: ubuntu w/o HTTP/SMTP/IMAP
@@ -105,7 +105,7 @@ stages:
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
- TFLAGS: "~323"
+ TFLAGS: ""
- job: http_only
displayName: ubuntu HTTP only
@@ -126,7 +126,7 @@ stages:
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
- TFLAGS: "~323"
+ TFLAGS: ""
- stage: linux_torture
dependsOn: linux
@@ -149,7 +149,7 @@ stages:
- script: make test-nonflaky
displayName: 'torture test'
env:
- TFLAGS: "-n -t --shallow=40 !FTP ~323"
+ TFLAGS: "-n -t --shallow=40 !FTP"
##########################################
### macOS jobs below
@@ -261,7 +261,7 @@ stages:
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
- TFLAGS: "~323 ~1056 ~1299"
+ TFLAGS: "~1056 ~1299"
- job: windows_msys2_mingw64_debug_openssl
displayName: msys2 mingw64 debug openssl
@@ -284,7 +284,7 @@ stages:
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
- TFLAGS: "~323 ~1056 ~1299"
+ TFLAGS: "~1056 ~1299"
- job: windows_msys1_mingw_debug_openssl
displayName: msys1 mingw debug openssl
diff --git a/.cirrus.yml b/.cirrus.yml
index 734c5a8c9..058cd1753 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -44,8 +44,8 @@ task:
- SKIP_TESTS=''
- uname -r
- case `uname -r` in
- 13.0*) SKIP_TESTS='!323 !1242 !1243 !2002 !2003';;
- 12.1*) SKIP_TESTS='!323 !1242 !1243 !2002 !2003';;
+ 13.0*) SKIP_TESTS='!1242 !1243 !2002 !2003';;
+ 12.1*) SKIP_TESTS='!1242 !1243 !2002 !2003';;
11.3*) SKIP_TESTS='!504 !1242 !1243 !2002 !2003';;
10.4*) SKIP_TESTS='!310 !311 !312 !313 !1082 !1242 !1243 !2002 !2003 !2034 !2035 !2037 !2038 !2041 !2042 !2048 !3000 !3001';;
esac
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh
index 3f587640d..5bfd84b84 100755
--- a/scripts/travis/script.sh
+++ b/scripts/travis/script.sh
@@ -28,12 +28,7 @@ if [ "$T" = "debug" ]; then
make
make examples
if [ -z $NOTESTS ]; then
- if [ "$TRAVIS_ARCH" = "aarch64" ] ; then
- # TODO: find out why this test is failing on arm64
- make "TFLAGS=-n !323" test-nonflaky
- else
- make TFLAGS=-n test-nonflaky
- fi
+ make TFLAGS=-n test-nonflaky
fi
fi