richter 01/03/26 23:09:32
Modified: . Tag: Embperl2c test.pl
Embperl Tag: Embperl2c Syntax.pm
test/cmp2 Tag: Embperl2c errdoc2.htm
test/conf Tag: Embperl2c httpd.conf.src startup.pl
startup_dso.pl
Log:
Embperl 2 - fix tests
Revision Changes Path
No revision
No revision
1.70.4.37 +0 -3 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.36
retrieving revision 1.70.4.37
diff -u -r1.70.4.36 -r1.70.4.37
--- test.pl 2001/03/27 06:42:10 1.70.4.36
+++ test.pl 2001/03/27 07:09:27 1.70.4.37
@@ -2,9 +2,6 @@
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl test.pl'
-use HTML::Embperl::Syntax ;
-
-#my $syn = HTML::Embperl::Syntax::GetSyntax ('SSI') ;
@testdata = (
'ascii' => { },
No revision
No revision
1.1.4.29 +2 -2 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.28
retrieving revision 1.1.4.29
diff -u -r1.1.4.28 -r1.1.4.29
--- Syntax.pm 2001/03/26 10:29:17 1.1.4.28
+++ Syntax.pm 2001/03/27 07:09:28 1.1.4.29
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.28 2001/03/26 10:29:17 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.29 2001/03/27 07:09:28 richter Exp $
#
###################################################################################
@@ -205,7 +205,7 @@
my @names ;
foreach (@xnames)
{
- push @names, $_ if (!$names{$_} && !(/^\s*$/)) ;
+ push @names, $1 if (!$names{$_} && (/^\s*([a-zA-Z_0-9:]+)\s*$/)) ;
$names{$_} = 1 ;
}
No revision
No revision
1.1.2.2 +1 -2 embperl/test/cmp2/Attic/errdoc2.htm
Index: errdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/errdoc2.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- errdoc2.htm 2000/10/26 07:33:02 1.1.2.1
+++ errdoc2.htm 2001/03/27 07:09:30 1.1.2.2
@@ -25,8 +25,7 @@
^syntax error at
^syntax error at
^syntax error at
-^}
-^ _ep_cp"</td></tr>
+^}"</td></tr>
^-
^ <tr><td>\[\d+\]ERR: 24: Line 1: Error in Perl code:
</table>
No revision
No revision
1.24.4.11 +2 -2 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.10
retrieving revision 1.24.4.11
diff -u -r1.24.4.10 -r1.24.4.11
--- httpd.conf.src 2001/03/17 22:20:54 1.24.4.10
+++ httpd.conf.src 2001/03/27 07:09:31 1.24.4.11
@@ -358,11 +358,11 @@
</Location>
-<Location /SSI/>
+<Location /embperl/SSI/>
PerlSetEnv EMBPERL_SYNTAX SSI
</Location>
-<Location /SSIEP/>
+<Location /embperl/SSIEP/>
PerlSetEnv EMBPERL_SYNTAX "Embperl SSI"
</Location>
1.9.6.1 +10 -0 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -r1.9 -r1.9.6.1
--- startup.pl 1999/11/04 05:30:20 1.9
+++ startup.pl 2001/03/27 07:09:31 1.9.6.1
@@ -1,6 +1,7 @@
BEGIN {
use lib qw{ . } ;
use ExtUtils::testlib ;
+ use Cwd ;
if ($EPSESSIONCLASS = $ENV{EMBPERL_SESSION_CLASS})
{
@@ -8,6 +9,15 @@
die $@ if ($@) ;
eval " use Apache\:\:Session\:\:$EPSESSIONCLASS; " ;
}
+
+ my $cwd = Cwd::fastcwd();
+ my $i = 0 ;
+ foreach (@INC)
+ {
+ $INC[$i] = "$cwd/$_" if (/^blib/) ;
+ $i++ ;
+ }
+
} ;
1.8.6.1 +9 -0 embperl/test/conf/startup_dso.pl
Index: startup_dso.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup_dso.pl,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- startup_dso.pl 2000/01/20 20:32:14 1.8
+++ startup_dso.pl 2001/03/27 07:09:31 1.8.6.1
@@ -1,12 +1,21 @@
BEGIN {
use lib qw{ . } ;
use ExtUtils::testlib ;
+ use Cwd ;
if ($EPSESSIONCLASS = $ENV{EMBPERL_SESSION_CLASS})
{
eval " use Apache\:\:Session; " ;
die $@ if ($@) ;
eval " use Apache\:\:Session\:\:$EPSESSIONCLASS; " ;
+ }
+
+ my $cwd = Cwd::fastcwd();
+ my $i = 0 ;
+ foreach (@INC)
+ {
+ $INC[$i] = "$cwd/$_" if (/^blib/) ;
+ $i++ ;
}
} ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
