From cvs-return-62850-archive-asf-public=cust-asf.ponee.io@httpd.apache.org Mon Mar 5 03:11:36 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 87F10180649 for ; Mon, 5 Mar 2018 03:11:35 +0100 (CET) Received: (qmail 77791 invoked by uid 500); 5 Mar 2018 02:11:34 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 77782 invoked by uid 99); 5 Mar 2018 02:11:34 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2018 02:11:34 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id AA5703A00C5 for ; Mon, 5 Mar 2018 02:11:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1825842 - /httpd/test/framework/trunk/t/ab/base.t Date: Mon, 05 Mar 2018 02:11:33 -0000 To: cvs@httpd.apache.org From: druggeri@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180305021133.AA5703A00C5@svn01-us-west.apache.org> Author: druggeri Date: Mon Mar 5 02:11:33 2018 New Revision: 1825842 URL: http://svn.apache.org/viewvc?rev=1825842&view=rev Log: Support cases when mod_ssl is not built Modified: httpd/test/framework/trunk/t/ab/base.t Modified: httpd/test/framework/trunk/t/ab/base.t URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ab/base.t?rev=1825842&r1=1825841&r2=1825842&view=diff ============================================================================== --- httpd/test/framework/trunk/t/ab/base.t (original) +++ httpd/test/framework/trunk/t/ab/base.t Mon Mar 5 02:11:33 2018 @@ -4,8 +4,9 @@ use warnings FATAL => 'all'; use Apache::Test; use Apache::TestConfig; use IPC::Open3; +my $vars = Apache::Test::vars(); -plan tests => 5; +plan tests => ($vars->{ssl_module_name} ? 5 : 2); sub run_and_gather_output { my $command = shift; @@ -18,21 +19,20 @@ sub run_and_gather_output { return { status => $status, stdout => \@cstdout, stderr => \@cstderr }; } -my $http_url = Apache::TestRequest::module2url("core", {scheme => 'http', path => '/'}); -my $https_url = Apache::TestRequest::module2url("mod_ssl", {scheme => 'https', path => '/'}); - my $cfg = Apache::TestConfig->new(()); my $ab_path = "$cfg->{httpd_basedir}" . "/bin/ab"; - +my $http_url = Apache::TestRequest::module2url("core", {scheme => 'http', path => '/'}); my $http_results = run_and_gather_output("$ab_path -q -n 10 $http_url"); ok ($http_results->{status} == 0); ok (scalar(@{$http_results->{stderr}}) == 0); +if ($vars->{ssl_module_name}) { + my $https_url = Apache::TestRequest::module2url($vars->{ssl_module_name}, {scheme => 'https', path => '/'}); + my $https_results = run_and_gather_output("$ab_path -q -n 10 $https_url"); + ok ($https_results->{status} == 0); + ok (scalar(@{$https_results->{stderr}}) == 0); -my $https_results = run_and_gather_output("$ab_path -q -n 10 $https_url"); -ok ($https_results->{status} == 0); -ok (scalar(@{$https_results->{stderr}}) == 0); - -#XXX: For some reason, stderr is getting pushed into stdout. This test will at least catch known SSL failures -ok (scalar(grep(/SSL.*(fail|err)/i, @{$https_results->{stdout}}) == 0) ); + #XXX: For some reason, stderr is getting pushed into stdout. This test will at least catch known SSL failures + ok (scalar(grep(/SSL.*(fail|err)/i, @{$https_results->{stdout}}) == 0) ); +}