X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2Fcgi-html.t;h=e878b21e5011b217037cfcc172f93e1cafbd3bd6;hb=3e0057efe0ecfa8a2ce5cf80276af07d2b2bc856;hp=3fe41d170a259296caa750384a87edf2a5eff3e8;hpb=93430cb427caeba01ba89b008008b46159a7c165;p=p5sagit%2Fp5-mst-13.2.git diff --git a/t/lib/cgi-html.t b/t/lib/cgi-html.t index 3fe41d1..e878b21 100755 --- a/t/lib/cgi-html.t +++ b/t/lib/cgi-html.t @@ -10,9 +10,6 @@ BEGIN { } BEGIN {$| = 1; print "1..20\n"; } -BEGIN {$eol = "\n" if $^O eq 'VMS'; - $eol = "\r\n" if $Config{ebcdic} eq 'define'; - $eol = "\cM\cJ" unless defined $eol; } END {print "not ok 1\n" unless $loaded;} use CGI (':standard','-no_debug','*h3','start_table'); $loaded = 1; @@ -20,6 +17,8 @@ print "ok 1\n"; ######################### End of black magic. +my $Is_EBCDIC = $Config{'ebcdic'} eq 'define'; + # util sub test { local($^W) = 0; @@ -40,10 +39,17 @@ test(7,h1({-align=>'CENTER'},['fred','agnes']) eq local($") = '-'; test(8,h1('fred','agnes','maura') eq '

fred-agnes-maura

',"open/close tag \$\" interpolation"); } -test(9,header() eq "Content-Type: text/html${eol}${eol}","header()"); -test(10,header(-type=>'image/gif') eq "Content-Type: image/gif${eol}${eol}","header()"); -test(11,header(-type=>'image/gif',-status=>'500 Sucks') eq "Status: 500 Sucks${eol}Content-Type: image/gif${eol}${eol}","header()"); -test(12,header(-nph=>1) eq "HTTP/1.0 200 OK${eol}Content-Type: text/html${eol}${eol}","header()"); +if (!$Is_EBCDIC) { +test(9,header() eq "Content-Type: text/html\015\012\015\012","header()"); +test(10,header(-type=>'image/gif') eq "Content-Type: image/gif\015\012\015\012","header()"); +test(11,header(-type=>'image/gif',-status=>'500 Sucks') eq "Status: 500 Sucks\015\012Content-Type: image/gif\015\012\015\012","header()"); +test(12,header(-nph=>1) eq "HTTP/1.0 200 OK\015\012Content-Type: text/html\015\012\015\012","header()"); +} else { +test(9,header() eq "Content-Type: text/html\r\n\r\n","header()"); +test(10,header(-type=>'image/gif') eq "Content-Type: image/gif\r\n\r\n","header()"); +test(11,header(-type=>'image/gif',-status=>'500 Sucks') eq "Status: 500 Sucks\r\nContent-Type: image/gif\r\n\r\n","header()"); +test(12,header(-nph=>1) eq "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n","header()"); +} test(13,start_html() ."\n" eq < Untitled Document @@ -63,9 +69,14 @@ test(15,start_html(-Title=>'The world of foo') ."\n" eq <'fred',-value=>['chocolate','chip'],-path=>'/')) eq - 'fred=chocolate&chip; path=/',"cookie()"); -test(17,header(-Cookie=>$cookie) =~ m!^Set-Cookie: fred=chocolate&chip\; path=/${eol}Date:.*${eol}Content-Type: text/html${eol}${eol}!s, + 'fred=chocolate&chip; domain=localhost; path=/',"cookie()"); +if (!$Is_EBCDIC) { +test(17,header(-Cookie=>$cookie) =~ m!^Set-Cookie: fred=chocolate&chip\; domain=localhost; path=/\015\012Date:.*\015\012Content-Type: text/html\015\012\015\012!s, "header(-cookie)"); +} else { +test(17,header(-Cookie=>$cookie) =~ m!^Set-Cookie: fred=chocolate&chip\; domain=localhost; path=/\r\nDate:.*\r\nContent-Type: text/html\r\n\r\n!s, + "header(-cookie)"); +} test(18,start_h3 eq '

'); test(19,end_h3 eq '

'); test(20,start_table({-border=>undef}) eq '');