Merge dd8fc65 into a5834e5

curl · Jul 10, 2017 · 844a9ae · 844a9ae
2 parents a5834e5 + dd8fc65
commit 844a9ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@ addons:
             - g++-4.8
             - libstdc++-4.8-dev
             - stunnel4
+            - openssh-server
 
 matrix:
     include:
@@ -66,7 +67,7 @@ script:
              export CC="gcc-4.8"
              ./configure --enable-debug --disable-shared --enable-code-coverage
              make
-             make TFLAGS=-n test-nonflaky
+             make TFLAGS="-n -v -d" test-nonflaky
              tests="1 2 3 4 5 6 7 8 9 10 200 201 202 300 301 302 500 501 502 503 504 506 507 508 509 510 511 512 513 514 515 516 517 518 519 600 601 800 801 802 803 900 901 902 903 1000 1001 1002 1004 1302 1303 1304 1305 1306 1308 1400 1401 1402 1404 1450 1451 1452 1502 1507 1508 1600 1602 1603 1605"
              make "TFLAGS=-n -e $tests" test-nonflaky
              make "TFLAGS=-n -t $tests" test-nonflaky

diff --git a/tests/runtests.pl b/tests/runtests.pl
@@ -5059,7 +5059,7 @@ sub serverfortest {
                         return "curl lacks $tlsext support";
                     }
                     else {
-                        return "curl lacks $server server support";
+                        return "curl lacks $server server support (protocols: @protocols)";
                     }
                 }
             }